Avoid parsing the whole dump-flows output in the OVS health check

openshift · Nov 15, 2017 · 33315ae · 33315ae
1 parent 250e6d7
commit 33315ae
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pkg/network/node/ovscontroller.go b/pkg/network/node/ovscontroller.go
@@ -58,10 +58,11 @@ func (oc *ovsController) AlreadySetUp() bool {
 		return false
 	}
 	expectedVersionNote := oc.getVersionNote()
-	for _, flow := range flows {
-		parsed, err := ovs.ParseFlow(ovs.ParseForDump, flow)
-		if err == nil && parsed.Table == ruleVersionTable && parsed.NoteHasPrefix(expectedVersionNote) {
-			return true
+	// The "version" flow should be the last one, so scan from the end
+	for i := len(flows) - 1; i >= 0; i-- {
+		parsed, err := ovs.ParseFlow(ovs.ParseForDump, flows[i])
+		if err == nil && parsed.Table == ruleVersionTable {
+			return parsed.NoteHasPrefix(expectedVersionNote)
 		}
 	}
 	return false