Skip to content

Commit

Permalink
diff setup
Browse files Browse the repository at this point in the history 
Signed-off-by: graysonwu <wgrayson@vmware.com>
  • Loading branch information
@GraysonWu
GraysonWu committed Nov 27, 2023
1 parent 675fa4b commit 567c17c
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 51 deletions.
6 changes: 3 additions & 3 deletions ci/jenkins/test-mc.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -398,12 +398,12 @@ function run_multicluster_e2e {
wait_for_multicluster_controller_ready

docker pull "${DOCKER_REGISTRY}"/antrea/nginx:1.21.6-alpine
docker save "${DOCKER_REGISTRY}"/antrea/nginx:1.21.6-alpine -o "${WORKDIR}"/nginx.tar
# docker save "${DOCKER_REGISTRY}"/antrea/nginx:1.21.6-alpine -o "${WORKDIR}"/nginx.tar

# Use the same agnhost image which is defined as 'agnhostImage' in antrea/test/e2e/framework.go to
# avoid pulling the image again when running Multi-cluster e2e tests.
docker pull "registry.k8s.io/e2e-test-images/agnhost:2.29"
docker save "registry.k8s.io/e2e-test-images/agnhost:2.29" -o "${WORKDIR}"/agnhost.tar
# docker save "registry.k8s.io/e2e-test-images/agnhost:2.29" -o "${WORKDIR}"/agnhost.tar

if [[ ${KIND} == "true" ]]; then
for name in ${CLUSTER_NAMES[*]}; do
Expand Down Expand Up @@ -476,7 +476,7 @@ if [[ ${KIND} == "true" ]]; then
SERVICE_CIDRS=("10.96.10.0/24" "10.96.20.0/24" "10.96.30.0/24")
POD_CIDRS=("10.244.0.0/20" "10.244.16.0/20" "10.244.32.0/20")
for i in {0..2}; do
./ci/kind/kind-setup.sh create ${CLUSTER_NAMES[$i]} --service-cidr ${SERVICE_CIDRS[$i]} --pod-cidr ${POD_CIDRS[$i]} --num-workers 1
./ci/kind/kind-setup.sh create ${CLUSTER_NAMES[$i]} --service-cidr ${SERVICE_CIDRS[$i]} --pod-cidr ${POD_CIDRS[$i]} --num-workers 5
done

for name in ${CLUSTER_NAMES[*]}; do
Expand Down
96 changes: 48 additions & 48 deletions mcnp_performance_test.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@ function setup_res {
generate_server_pod_yaml
generate_mcnp_yaml

kubectl apply -f ${YAML_DIR}/ns.yml --context $CLIENT_CLUSTER
kubectl apply -f ${YAML_DIR}/clientPod.yml --context $CLIENT_CLUSTER
kubectl apply -f ${YAML_DIR}/serverPod.yml --context $SERVER_CLUSTER
kubectl apply -f ${YAML_DIR}/ns.yml --context $CLIENT_CLUSTER > /dev/null
kubectl apply -f ${YAML_DIR}/clientPod.yml --context $CLIENT_CLUSTER > /dev/null
kubectl apply -f ${YAML_DIR}/serverPod.yml --context $SERVER_CLUSTER > /dev/null
}

function get_agent_names {
Expand Down Expand Up @@ -381,60 +381,60 @@ function with_label_sync_test {
start_timestamps=$(date +"%s%3N")
kubectl apply -f ${YAML_DIR}/ns.yml --context $CLIENT_CLUSTER

label_res_exp_all_done_timestamps=$(get_label_res_exp_all_timestamps "$time_since" "$LABEL_ID_RES_EXP_DONE_KEYWORD")
label_res_imp_all_done_timestamps=$(get_label_res_imp_all_timestamps "$time_since" "$LABEL_ID_RES_IMP_DONE_KEYWORD")
label_res_exp_all_start_timestamps=$(get_label_res_exp_all_timestamps "$time_since" "$LABEL_ID_RES_EXP_START_KEYWORD")
label_res_imp_all_start_timestamps=$(get_label_res_imp_all_timestamps "$time_since" "$LABEL_ID_RES_IMP_START_KEYWORD")

label_res_exp_first_done_timestamps=$(get_label_res_exp_first_timestamps "$time_since" "$LABEL_ID_RES_EXP_DONE_KEYWORD")
label_res_imp_first_done_timestamps=$(get_label_res_imp_first_timestamps "$time_since" "$LABEL_ID_RES_IMP_DONE_KEYWORD")
label_res_exp_first_start_timestamps=$(get_label_res_exp_first_timestamps "$time_since" "$LABEL_ID_RES_EXP_START_KEYWORD")
label_res_imp_first_start_timestamps=$(get_label_res_imp_first_timestamps "$time_since" "$LABEL_ID_RES_IMP_START_KEYWORD")

server_label_all_done_timestamps=$(get_label_all_timestamps "$time_since" "$SERVER_CLUSTER" "$server_mc_controller_name" "$LABEL_ID_DONE_KEYWORD")
client_label_all_done_timestamps=$(get_label_all_timestamps "$time_since" "$CLIENT_CLUSTER" "$client_mc_controller_name" "$LABEL_ID_DONE_KEYWORD")
server_label_all_start_timestamps=$(get_label_all_timestamps "$time_since" "$SERVER_CLUSTER" "$server_mc_controller_name" "$LABEL_ID_START_KEYWORD")
client_label_all_start_timestamps=$(get_label_all_timestamps "$time_since" "$CLIENT_CLUSTER" "$client_mc_controller_name" "$LABEL_ID_START_KEYWORD")

server_label_first_done_timestamps=$(get_label_first_timestamps "$time_since" "$SERVER_CLUSTER" "$server_mc_controller_name" "$LABEL_ID_DONE_KEYWORD")
client_label_first_done_timestamps=$(get_label_first_timestamps "$time_since" "$CLIENT_CLUSTER" "$client_mc_controller_name" "$LABEL_ID_DONE_KEYWORD")
server_label_first_start_timestamps=$(get_label_first_timestamps "$time_since" "$SERVER_CLUSTER" "$server_mc_controller_name" "$LABEL_ID_START_KEYWORD")
client_label_first_start_timestamps=$(get_label_first_timestamps "$time_since" "$CLIENT_CLUSTER" "$client_mc_controller_name" "$LABEL_ID_START_KEYWORD")
# label_res_exp_all_done_timestamps=$(get_label_res_exp_all_timestamps "$time_since" "$LABEL_ID_RES_EXP_DONE_KEYWORD")
# label_res_imp_all_done_timestamps=$(get_label_res_imp_all_timestamps "$time_since" "$LABEL_ID_RES_IMP_DONE_KEYWORD")
# label_res_exp_all_start_timestamps=$(get_label_res_exp_all_timestamps "$time_since" "$LABEL_ID_RES_EXP_START_KEYWORD")
# label_res_imp_all_start_timestamps=$(get_label_res_imp_all_timestamps "$time_since" "$LABEL_ID_RES_IMP_START_KEYWORD")
#
# label_res_exp_first_done_timestamps=$(get_label_res_exp_first_timestamps "$time_since" "$LABEL_ID_RES_EXP_DONE_KEYWORD")
# label_res_imp_first_done_timestamps=$(get_label_res_imp_first_timestamps "$time_since" "$LABEL_ID_RES_IMP_DONE_KEYWORD")
# label_res_exp_first_start_timestamps=$(get_label_res_exp_first_timestamps "$time_since" "$LABEL_ID_RES_EXP_START_KEYWORD")
# label_res_imp_first_start_timestamps=$(get_label_res_imp_first_timestamps "$time_since" "$LABEL_ID_RES_IMP_START_KEYWORD")
#
# server_label_all_done_timestamps=$(get_label_all_timestamps "$time_since" "$SERVER_CLUSTER" "$server_mc_controller_name" "$LABEL_ID_DONE_KEYWORD")
# client_label_all_done_timestamps=$(get_label_all_timestamps "$time_since" "$CLIENT_CLUSTER" "$client_mc_controller_name" "$LABEL_ID_DONE_KEYWORD")
# server_label_all_start_timestamps=$(get_label_all_timestamps "$time_since" "$SERVER_CLUSTER" "$server_mc_controller_name" "$LABEL_ID_START_KEYWORD")
# client_label_all_start_timestamps=$(get_label_all_timestamps "$time_since" "$CLIENT_CLUSTER" "$client_mc_controller_name" "$LABEL_ID_START_KEYWORD")
#
# server_label_first_done_timestamps=$(get_label_first_timestamps "$time_since" "$SERVER_CLUSTER" "$server_mc_controller_name" "$LABEL_ID_DONE_KEYWORD")
# client_label_first_done_timestamps=$(get_label_first_timestamps "$time_since" "$CLIENT_CLUSTER" "$client_mc_controller_name" "$LABEL_ID_DONE_KEYWORD")
# server_label_first_start_timestamps=$(get_label_first_timestamps "$time_since" "$SERVER_CLUSTER" "$server_mc_controller_name" "$LABEL_ID_START_KEYWORD")
# client_label_first_start_timestamps=$(get_label_first_timestamps "$time_since" "$CLIENT_CLUSTER" "$client_mc_controller_name" "$LABEL_ID_START_KEYWORD")

policy_update_timestamps=$(get_policy_update_timestamps "$time_since")
pod_update_timestamps=$(get_pod_update_timestamps "$time_since")

end_timestamps=$(( policy_update_timestamps > pod_update_timestamps ? policy_update_timestamps : pod_update_timestamps ))

get_timestamps_array "$time_since" "$LABEL_ID_RES_EXP_START_KEYWORD" res_exp_create_start_times "$client_mc_controller_name" "kube-system" "$CLIENT_CLUSTER" "$start_timestamps"
get_timestamps_array "$time_since" "$LABEL_ID_RES_EXP_DONE_KEYWORD" res_exp_create_done_times "$client_mc_controller_name" "kube-system" "$CLIENT_CLUSTER" "$start_timestamps"
get_timestamps_array "$time_since" "$LABEL_ID_RES_IMP_START_KEYWORD" res_imp_create_start_times "$leader_mc_controller_name" "antrea-multicluster" "$LEADER_CLUSTER" "$start_timestamps"
get_timestamps_array "$time_since" "$LABEL_ID_RES_IMP_DONE_KEYWORD" res_imp_create_done_times "$leader_mc_controller_name" "antrea-multicluster" "$LEADER_CLUSTER" "$start_timestamps"
get_timestamps_array "$time_since" "$LABEL_ID_START_KEYWORD" label_id_create_start_times "$client_mc_controller_name" "kube-system" "$CLIENT_CLUSTER" "$start_timestamps"
get_timestamps_array "$time_since" "$LABEL_ID_DONE_KEYWORD" label_id_create_done_times "$client_mc_controller_name" "kube-system" "$CLIENT_CLUSTER" "$start_timestamps"
# get_timestamps_array "$time_since" "$LABEL_ID_RES_EXP_START_KEYWORD" res_exp_create_start_times "$client_mc_controller_name" "kube-system" "$CLIENT_CLUSTER" "$start_timestamps"
# get_timestamps_array "$time_since" "$LABEL_ID_RES_EXP_DONE_KEYWORD" res_exp_create_done_times "$client_mc_controller_name" "kube-system" "$CLIENT_CLUSTER" "$start_timestamps"
# get_timestamps_array "$time_since" "$LABEL_ID_RES_IMP_START_KEYWORD" res_imp_create_start_times "$leader_mc_controller_name" "antrea-multicluster" "$LEADER_CLUSTER" "$start_timestamps"
# get_timestamps_array "$time_since" "$LABEL_ID_RES_IMP_DONE_KEYWORD" res_imp_create_done_times "$leader_mc_controller_name" "antrea-multicluster" "$LEADER_CLUSTER" "$start_timestamps"
# get_timestamps_array "$time_since" "$LABEL_ID_START_KEYWORD" label_id_create_start_times "$client_mc_controller_name" "kube-system" "$CLIENT_CLUSTER" "$start_timestamps"
# get_timestamps_array "$time_since" "$LABEL_ID_DONE_KEYWORD" label_id_create_done_times "$client_mc_controller_name" "kube-system" "$CLIENT_CLUSTER" "$start_timestamps"

echo "Time for with LabelIdentity sync case:"
echo " "
echo " - First ResourceExport create request sent latency: $(( label_res_exp_first_start_timestamps - start_timestamps )) ms"
echo " - All ResourceExport create requests sent latency: $(( label_res_exp_all_start_timestamps - start_timestamps )) ms"
echo " - First ResourceExport created latency: $(( label_res_exp_first_done_timestamps - start_timestamps )) ms"
echo " - All ResourceExports created latency: $(( label_res_exp_all_done_timestamps - start_timestamps )) ms"
echo " "
echo " - First ResourceImport create request sent latency: $(( label_res_imp_first_start_timestamps - start_timestamps )) ms"
echo " - All ResourceImport create requests sent latency: $(( label_res_imp_all_start_timestamps - start_timestamps )) ms"
echo " - First ResourceImport created latency: $(( label_res_imp_first_done_timestamps - start_timestamps )) ms"
echo " - All ResourceImport created latency: $(( label_res_imp_all_done_timestamps - start_timestamps )) ms"
echo " "
echo " - First LabelIdentity create request sent on client cluster latency: $(( client_label_first_start_timestamps - start_timestamps )) ms"
echo " - All LabelIdentity create requests sent on client cluster latency: $(( client_label_all_start_timestamps - start_timestamps )) ms"
echo " - First LabelIdentity created on client cluster latency: $(( client_label_first_done_timestamps - start_timestamps )) ms"
echo " - All LabelIdentity created on client cluster latency: $(( client_label_all_done_timestamps - start_timestamps )) ms"
echo " "
echo " - First LabelIdentity create request sent on server cluster latency: $(( server_label_first_start_timestamps - start_timestamps )) ms"
echo " - All LabelIdentity create requests sent on server cluster latency: $(( server_label_all_start_timestamps - start_timestamps )) ms"
echo " - First LabelIdentity created on client server latency: $(( server_label_first_done_timestamps - start_timestamps )) ms"
echo " - All LabelIdentity created on client server latency: $(( server_label_all_done_timestamps - start_timestamps )) ms"
echo " "
# echo " - First ResourceExport create request sent latency: $(( label_res_exp_first_start_timestamps - start_timestamps )) ms"
# echo " - All ResourceExport create requests sent latency: $(( label_res_exp_all_start_timestamps - start_timestamps )) ms"
# echo " - First ResourceExport created latency: $(( label_res_exp_first_done_timestamps - start_timestamps )) ms"
# echo " - All ResourceExports created latency: $(( label_res_exp_all_done_timestamps - start_timestamps )) ms"
# echo " "
# echo " - First ResourceImport create request sent latency: $(( label_res_imp_first_start_timestamps - start_timestamps )) ms"
# echo " - All ResourceImport create requests sent latency: $(( label_res_imp_all_start_timestamps - start_timestamps )) ms"
# echo " - First ResourceImport created latency: $(( label_res_imp_first_done_timestamps - start_timestamps )) ms"
# echo " - All ResourceImport created latency: $(( label_res_imp_all_done_timestamps - start_timestamps )) ms"
# echo " "
# echo " - First LabelIdentity create request sent on client cluster latency: $(( client_label_first_start_timestamps - start_timestamps )) ms"
# echo " - All LabelIdentity create requests sent on client cluster latency: $(( client_label_all_start_timestamps - start_timestamps )) ms"
# echo " - First LabelIdentity created on client cluster latency: $(( client_label_first_done_timestamps - start_timestamps )) ms"
# echo " - All LabelIdentity created on client cluster latency: $(( client_label_all_done_timestamps - start_timestamps )) ms"
# echo " "
# echo " - First LabelIdentity create request sent on server cluster latency: $(( server_label_first_start_timestamps - start_timestamps )) ms"
# echo " - All LabelIdentity create requests sent on server cluster latency: $(( server_label_all_start_timestamps - start_timestamps )) ms"
# echo " - First LabelIdentity created on client server latency: $(( server_label_first_done_timestamps - start_timestamps )) ms"
# echo " - All LabelIdentity created on client server latency: $(( server_label_all_done_timestamps - start_timestamps )) ms"
# echo " "
echo " - Pod Classifier flow update latency: $(( pod_update_timestamps - start_timestamps )) ms"
echo " - Policy conj match flow update latency: $(( policy_update_timestamps - start_timestamps )) ms"
echo "Total latency: $(( end_timestamps - start_timestamps )) ms"
Expand Down
1 change: 1 addition & 0 deletions multicluster/cmd/multicluster-controller/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import (
"antrea.io/antrea/multicluster/controllers/multicluster/common"
antreacrdv1alpha1 "antrea.io/antrea/pkg/apis/crd/v1alpha1"
antreacrdv1beta1 "antrea.io/antrea/pkg/apis/crd/v1beta1"

"antrea.io/antrea/pkg/apiserver/certificate"
"antrea.io/antrea/pkg/util/env"
k8sutil "antrea.io/antrea/pkg/util/k8s"
Expand Down

0 comments on commit 567c17c

Please sign in to comment.