make ensuring a poll (#1506)

Author: nammn

pkg/agent/replica_set_port_manager.go

@@ -128,7 +128,7 @@ func (r *ReplicaSetPortManager) calculateExpectedPorts() (processPortMap map[str
 	for _, podState := range r.currentPodStates {
 		if !podState.ReachedGoalState {
 			r.log.Debugf("Port change required but not all pods reached goal state, abandoning port change")
-			return processPortMap, portChangeRequired, oldPort
+			return processPortMap, true, oldPort
 		}
 	}
 
@@ -143,5 +143,5 @@ func (r *ReplicaSetPortManager) calculateExpectedPorts() (processPortMap map[str
 		}
 	}
 
-	return processPortMap, portChangeRequired, oldPort
+	return processPortMap, true, oldPort
 }

test/e2e/util/mongotester/mongotester.go

@@ -307,14 +307,24 @@ func (m *Tester) WaitForRotatedCertificate(mdb mdbv1.MongoDBCommunity, initialCe
 	}
 }
 
+// EnsureMongodConfig is mostly used for checking port changes. Port changes take some until they finish.
+// We cannot fully rely on the statefulset or resource being ready/running since it will change its state multiple
+// times during a port change. That means a resource might leave, go into and leave running multiple times until
+// it truly finished its port change.
 func (m *Tester) EnsureMongodConfig(selector string, expected interface{}) func(*testing.T) {
 	return func(t *testing.T) {
-		opts, err := m.getCommandLineOptions()
+		connectivityOpts := defaults()
+		err := wait.Poll(connectivityOpts.IntervalTime, connectivityOpts.TimeoutTime, func() (done bool, err error) {
+			opts, err := m.getCommandLineOptions()
+			assert.NoError(t, err)
+
+			parsed := objx.New(bsonToMap(opts)).Get("parsed").ObjxMap()
+
+			return expected == parsed.Get(selector).Data(), nil
+		})
+
 		assert.NoError(t, err)
 
-		// The options are stored under the key "parsed"
-		parsed := objx.New(bsonToMap(opts)).Get("parsed").ObjxMap()
-		assert.Equal(t, expected, parsed.Get(selector).Data())
 	}
 }