Merge pull request #577 from noironetworks/reset-wait

Skip reset.conf if we processed PlatformConfig del
noironetworks · Jul 26, 2024 · 2ea7e51 · 2ea7e51
2 parents 02a67b9 + cdccecc
commit 2ea7e51
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 3 deletions.
diff --git a/agent-ovs/cmd/opflex_agent.cpp b/agent-ovs/cmd/opflex_agent.cpp
@@ -121,9 +121,11 @@ class AgentLauncher : FSWatcher::Watcher {
                         break;
                     }
                     if (!stopped && need_reset) {
-                        LOG(INFO) << "Disconnect from existing peers and " <<
-                            "fallback to configured list because of configuration update";
-                        framework.resetAllUnconfiguredPeers();
+                        if (agent.shouldReset()) {
+                            LOG(WARNING) << "Disconnect from existing peers and " <<
+                                "fallback to configured list because of configuration update";
+                            framework.resetAllUnconfiguredPeers();
+                        }
                         need_reset = false;
                         continue;
                     }

diff --git a/agent-ovs/lib/Agent.cpp b/agent-ovs/lib/Agent.cpp
@@ -189,6 +189,7 @@ void Agent::setProperties(const boost::property_tree::ptree& properties) {
     static const std::string OPFLEX_MULTICAST_CACHE_TIMEOUT("opflex.timers.mcast-cache-timeout");
     static const std::string OPFLEX_SWITCH_SYNC_DELAY("opflex.timers.switch-sync-delay");
     static const std::string OPFLEX_SWITCH_SYNC_DYNAMIC("opflex.timers.switch-sync-dynamic");
+    static const std::string OPFLEX_RESET_WAIT_DELAY("opflex.timers.reset-wait-delay");
     static const std::string DISABLED_FEATURES("feature.disabled");
     static const std::string BEHAVIOR_L34FLOWS_WITHOUT_SUBNET("behavior.l34flows-without-subnet");
     static const std::string OPFLEX_ASYC_JSON("opflex.asyncjson.enabled");
@@ -415,6 +416,14 @@ void Agent::setProperties(const boost::property_tree::ptree& properties) {
         LOG(INFO) << "Switch Sync Dynamic set to " << switch_sync_dynamic << " seconds";
     }
 
+    optional<uint32_t> resetWaitDelayOpt =
+        properties.get_optional<uint32_t>(OPFLEX_RESET_WAIT_DELAY);
+    if (resetWaitDelayOpt) {
+        reset_wait_delay = resetWaitDelayOpt.get();
+        LOG(INFO) << "Reset Wait delay set to " << reset_wait_delay << " seconds";
+    }
+    updateResetTime();
+
     optional<const ptree&> rendererPlugins =
         properties.get_child_optional(PLUGINS_RENDERER);
 

diff --git a/agent-ovs/lib/EndpointManager.cpp b/agent-ovs/lib/EndpointManager.cpp
@@ -1595,6 +1595,7 @@ void EndpointManager::configUpdated(const URI& uri) {
 
     if (!config) {
         LOG(WARNING) << "Platform config has been deleted. Disconnect from existing peers and fallback to configured list";
+        agent.updateResetTime();
         framework.resetAllUnconfiguredPeers();
     }
 }

diff --git a/agent-ovs/lib/include/opflexagent/Agent.h b/agent-ovs/lib/include/opflexagent/Agent.h
@@ -310,6 +310,25 @@ typedef opflex::ofcore::OFConstants::OpflexElementMode opflex_elem_t;
      */
     uint32_t getSwitchSyncDynamic() { return switch_sync_dynamic; }
 
+    /**
+     * save the last PlatformConfig delete time
+     */
+    void updateResetTime() {
+        std::unique_lock<std::mutex> guard(reset_time_mutex);
+
+        reset_time = std::chrono::steady_clock::now();
+    }
+
+    /**
+     * Check if enough time has passed since last PlatformConfig delete / reset
+     */
+    bool shouldReset() {
+        std::unique_lock<std::mutex> guard(reset_time_mutex);
+
+        auto diff = std::chrono::steady_clock::now() - reset_time;
+        return diff > std::chrono::seconds(reset_wait_delay);
+    }
+
     /**
      * Common function b/w Agent and Server to add all supported universes
      * @param root pointer to DmtreeRoot under which the universes will be created
@@ -361,6 +380,11 @@ typedef opflex::ofcore::OFConstants::OpflexElementMode opflex_elem_t;
     /* How long to wait from platform config to switch Sync */
     uint32_t switch_sync_delay = 5; /* seconds */
     uint32_t switch_sync_dynamic = 0; /* dynamic retry default 0 no retry */
+    uint32_t reset_wait_delay  = 5; /* seconds */
+    /* Timestamp of last PlatformConfig delete event */
+    std::chrono::steady_clock::time_point reset_time;
+    /* mutex to update reset_time */
+    std::mutex reset_time_mutex;
     // startup policy duration from new connection in seconds
     uint64_t startupPolicyDuration = 0; /* seconds */
     bool localResolveAftConn = false; /* local resolve after conn estb */

diff --git a/agent-ovs/opflex-agent-ovs.conf.in b/agent-ovs/opflex-agent-ovs.conf.in
@@ -145,6 +145,12 @@
            // Max retries will be 5 so as to not wait
            // forever
            // "switch-sync-dynamic": 0
+           //
+           // skip reset.conf processing if platformConfig
+           // delete was processed within this interval.
+           // This is to avoid duplicate reset processing
+           // for the same event
+           // "reset-wait-delay": 5
        },
        // Statistics. Counters for various artifacts.
        // mode: can be either