Send from multiple "remote" client pods

Move remote client pods to a list of pods instead of just one pod. Signed-off-by: Billy McFall <[email protected]>
wizhaoredhat · Mar 1, 2022 · 3e9852c · 3e9852c
1 parent f7d8019
commit 3e9852c
Show file tree

Hide file tree

Showing 5 changed files with 534 additions and 448 deletions.
diff --git a/README.md b/README.md
@@ -276,7 +276,7 @@ Default/Override Values:
   Launch Control:
     FT_HOSTONLY                        false
     FT_REQ_SERVER_NODE                 all
-    FT_REQ_REMOTE_CLIENT_NODE          
+    FT_REQ_REMOTE_CLIENT_NODE          first
   From YAML Files:
     NET_ATTACH_DEF_NAME                ftnetattach
     SRIOV_RESOURCE_NAME                openshift.io/mlnx_bf
@@ -356,7 +356,7 @@ Default/Override Values:
     HTTP_SERVER_POD_NAME               ft-http-server-pod-v4
     CLEAN_ALL                          false
     FT_REQ_SERVER_NODE                 all
-    FT_REQ_REMOTE_CLIENT_NODE          
+    FT_REQ_REMOTE_CLIENT_NODE          first
   Label Management:
     FT_REQ_SERVER_NODE                 all
     FT_SERVER_NODE_LABEL               ft.ServerPod
@@ -437,7 +437,7 @@ Default/Override Values:
     IPERF_TIME                         2
     OVN_TRACE                          false
     OVN_TRACE_CMD                      ./ovnkube-trace -loglevel=5 -tcp
-    FT_REQ_REMOTE_CLIENT_NODE          all
+    FT_REQ_REMOTE_CLIENT_NODE          first
   OVN Trace Control:
     OVN_K_NAMESPACE                    ovn-kubernetes
     SSL_ENABLE                         -noSSL
@@ -470,8 +470,8 @@ Queried Values:
     SERVER_POD_NODE                    ovn-worker3
     LOCAL_CLIENT_NODE                  ovn-worker3
     LOCAL_CLIENT_POD                   ft-client-pod-76qlj
-    REMOTE_CLIENT_NODE                 ovn-worker4
-    REMOTE_CLIENT_POD                  ft-client-pod-566xj
+    REMOTE_CLIENT_NODE_LIST             ovn-worker4
+    REMOTE_CLIENT_POD_LIST             ft-client-pod-566xj
     HTTP_CLUSTERIP_POD_SVC_IPV4        10.96.39.137
     HTTP_CLUSTERIP_POD_SVC_PORT        8080
     HTTP_NODEPORT_POD_SVC_IPV4         10.96.28.182
@@ -486,8 +486,8 @@ Queried Values:
     SERVER_HOST_NODE                   ovn-worker3
     LOCAL_CLIENT_HOST_NODE             ovn-worker3
     LOCAL_CLIENT_HOST_POD              ft-client-pod-host-kttz2
-    REMOTE_CLIENT_HOST_NODE            ovn-worker4
-    REMOTE_CLIENT_HOST_POD             ft-client-pod-host-hp5r2
+    REMOTE_CLIENT_HOST_NODE_LIST       ovn-worker4
+    REMOTE_CLIENT_HOST_POD_LIST        ft-client-pod-host-hp5r2
     HTTP_CLUSTERIP_HOST_SVC_IPV4       10.96.21.56
     HTTP_CLUSTERIP_HOST_SVC_PORT       8081
     HTTP_NODEPORT_HOST_SVC_IPV4        10.96.252.33
@@ -801,6 +801,11 @@ To get the DNS domain suffixes for the fully qualified service names, examine th
     options ndots:5
 ```
 
+In a single cluster environment, `FT_REQ_REMOTE_CLIENT_NODE` is defaulted to `first`.
+This implies to choose the first Client Pod that is not on the same node as the Server Pod.
+In a multi-cluster environment, `FT_REQ_REMOTE_CLIENT_NODE` is defaulted to `all`, which
+causes the script to loop through all of the Client Pods that aren't on the same node as the Server Pod.
+
 ### mccleanup.sh
 
 *'mccleanup.sh'* - Loops through all existing clusters and calls *'cleanup.sh'* on each cluster

diff --git a/labels.sh b/labels.sh
@@ -22,6 +22,7 @@ add_labels() {
         # - Assign label so SR-IOV Client DaemonSet Pod started on this Node.
         FOUND_SRIOV=true
         FT_SRIOV_CLIENT=true
+        echo "  Applying Server Label \"$FT_CLIENT_NODE_LABEL=sriov\" to ${NODE_ARRAY[$i]}"
         kubectl label nodes ${NODE_ARRAY[$i]} --overwrite=true $FT_CLIENT_NODE_LABEL=sriov
       else
         # SR-IOV NOT detected.
@@ -30,17 +31,19 @@ add_labels() {
         # - Assign label so Normal Client DaemonSet Pod started on this Node.
         FOUND_SRIOV=false
         FT_NORMAL_CLIENT=true
+        echo "  Applying Server Label \"$FT_CLIENT_NODE_LABEL=client\" to ${NODE_ARRAY[$i]}"
         kubectl label nodes ${NODE_ARRAY[$i]} --overwrite=true $FT_CLIENT_NODE_LABEL=client
       fi
 
       if [ "$FOUND_NODE" == false ] && [ "$FT_REQ_SERVER_NODE" == all ] || [ "$FT_REQ_SERVER_NODE" == "${NODE_ARRAY[$i]}" ]; then
-        echo "  Applying Server Label \"$FT_SERVER_NODE_LABEL\" to ${NODE_ARRAY[$i]}"
+        echo "  Applying Server Label \"$FT_SERVER_NODE_LABEL=server\" to ${NODE_ARRAY[$i]}"
         kubectl label nodes ${NODE_ARRAY[$i]} --overwrite=true $FT_SERVER_NODE_LABEL=server
         FOUND_NODE=true
         if [ "$FOUND_SRIOV" == true ]; then
           FT_SRIOV_SERVER=true
         fi
       else
+        echo "  Applying Server Label \"$FT_SERVER_NODE_LABEL=none\" to ${NODE_ARRAY[$i]}"
         kubectl label nodes ${NODE_ARRAY[$i]} --overwrite=true $FT_SERVER_NODE_LABEL=none
       fi
     fi

diff --git a/mctest.sh b/mctest.sh
@@ -40,7 +40,7 @@ do
         echo "${CLUSTER_ARRAY[$i]}"
         echo "-----------"
         echo
-        FT_NAMESPACE=${FT_NAMESPACE} FT_SVC_QUALIFIER=${FT_SVC_QUALIFIER} FT_NOTES=false ./test.sh
+        FT_NAMESPACE=${FT_NAMESPACE} FT_SVC_QUALIFIER=${FT_SVC_QUALIFIER} FT_NOTES=false FT_REQ_REMOTE_CLIENT_NODE=all ./test.sh
       else
         echo "  Skipping testing on Full Deployment on Cluster ${CLUSTER_ARRAY[$i]}"
       fi