szaszm commented on code in PR #2292: URL: https://github.com/apache/nifi-minifi-cpp/pull/2292#discussion_r4388478326
########## libminifi/src/c2/C2ConnectionWatchdog.cpp: ########## Review Comment: I think we could do this without an extra thread: just have the C2 agent check the last successful connection timestamp after a connection attempt, and if it's too long ago, call the shutdown callback. ########## libminifi/test/integration/C2ConnectionTimeoutTest.cpp: ########## @@ -0,0 +1,93 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#include <atomic> +#include <string> + +#include "c2/C2Agent.h" +#include "c2/C2ExitCodes.h" +#include "integration/HTTPIntegrationBase.h" +#include "integration/ServerAwareHandler.h" +#include "properties/Configuration.h" +#include "unit/Catch.h" +#include "unit/TestBase.h" +#include "unit/TestUtils.h" + +using namespace std::literals::chrono_literals; + +namespace org::apache::nifi::minifi::test { + +class FailingHeartbeatHandler : public ServerAwareHandler { Review Comment: I think it would be nice to test connection timeouts (in addition or instead of HTTP 500), as I imagine that's a more common failure scenario when the network is down. ########## libminifi/test/unit/C2ShutdownRecorder.h: ########## @@ -0,0 +1,53 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +#pragma once + +#include <cstddef> +#include <mutex> +#include <optional> +#include <utility> +#include <vector> + +#include "RequestShutdown.h" + +namespace org::apache::nifi::minifi::test { + +class C2ShutdownRecorder { Review Comment: What's the purpose of this? ########## conf/minifi.properties.in: ########## @@ -121,6 +121,8 @@ nifi.c2.full.heartbeat=false # nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.name=ProcessorMetric # nifi.c2.root.class.definitions.metrics.metrics.processorMetrics.classes=GetFileMetrics +# nifi.c2.connection.timeout=30 min Review Comment: Can we parse, days, weeks, and months here? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
