Skip to content

Commit 98f85dc

Browse files
committed
functions - fix run_mongo and run_mongos for collecting k8s logs
1 parent c2cce78 commit 98f85dc

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

e2e-tests/functions

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -720,11 +720,15 @@ run_mongo() {
720720
local suffix=${4:-.svc.cluster.local}
721721
local client_container=$(kubectl_bin get pods --selector=name=psmdb-client -o 'jsonpath={.items[].metadata.name}')
722722
local mongo_flag="$5"
723-
local replica_set=$(echo "$uri" | sed -r 's/.*\-(rs[0-9]|cfg)(\.|-).*/\1/')
724-
725-
kubectl_bin exec ${client_container} -- \
726-
bash -c "printf '$command\n' | mongo $driver://$uri$suffix/admin?ssl=false\&replicaSet=$replica_set $mongo_flag"
723+
local replica_set=$(echo "$uri" | grep -oE '\-(rs[0-9]|cfg)(\.|-)' | sed 's/^.//;s/.$//' | head -n1)
727724

725+
if [[ ${FUNCNAME[1]} == "collect_k8s_logs" ]]; then
726+
kubectl exec ${client_container} -- \
727+
bash -c "printf '$command\n' | mongo $driver://$uri$suffix/admin?ssl=false\&replicaSet=$replica_set $mongo_flag"
728+
else
729+
kubectl_bin exec ${client_container} -- \
730+
bash -c "printf '$command\n' | mongo $driver://$uri$suffix/admin?ssl=false\&replicaSet=$replica_set $mongo_flag"
731+
fi
728732
}
729733

730734
run_mongo_tls() {
@@ -734,11 +738,15 @@ run_mongo_tls() {
734738
local suffix=${4:-.svc.cluster.local}
735739
local client_container=$(kubectl_bin get pods --selector=name=psmdb-client -o 'jsonpath={.items[].metadata.name}')
736740
local mongo_flag="$5"
737-
local replica_set=$(echo "$uri" | sed -r 's/.*\-(rs[0-9]|cfg)(\.|-).*/\1/')
738-
739-
kubectl_bin exec ${client_container} -- \
740-
bash -c "printf '$command\n' | mongo $driver://$uri$suffix/admin?replicaSet=$replica_set --tls --tlsCAFile /etc/mongodb-ssl/ca.crt --tlsCertificateKeyFile /tmp/tls.pem --tlsAllowInvalidHostnames $mongo_flag"
741+
local replica_set=$(echo "$uri" | grep -oE '\-(rs[0-9]|cfg)(\.|-)' | sed 's/^.//;s/.$//' | head -n1)
741742

743+
if [[ ${FUNCNAME[1]} == "collect_k8s_logs" ]]; then
744+
kubectl exec ${client_container} -- \
745+
bash -c "printf '$command\n' | mongo $driver://$uri$suffix/admin?replicaSet=$replica_set --tls --tlsCAFile /etc/mongodb-ssl/ca.crt --tlsCertificateKeyFile /tmp/tls.pem --tlsAllowInvalidHostnames $mongo_flag"
746+
else
747+
kubectl_bin exec ${client_container} -- \
748+
bash -c "printf '$command\n' | mongo $driver://$uri$suffix/admin?replicaSet=$replica_set --tls --tlsCAFile /etc/mongodb-ssl/ca.crt --tlsCertificateKeyFile /tmp/tls.pem --tlsAllowInvalidHostnames $mongo_flag"
749+
fi
742750
}
743751

744752
run_mongos() {
@@ -1372,7 +1380,7 @@ collect_k8s_logs() {
13721380
for com in "${command[@]}"; do
13731381
echo "##### START: ${com} #####" >>${logs_path}/mongodb_${psmdb_name}_${psmdb_replset}.mongo
13741382
run_mongo "${com}" "${psmdb_user}:${psmdb_pass}@${psmdb_name}-${psmdb_replset}.${namespace}" >>${logs_path}/mongodb_${psmdb_name}_${psmdb_replset}.mongo
1375-
echo -e "##### END: ${com} #####\n" >>${logs_path}/mongodb_${psmdb_name}_${psmdb_replset}.mongo
1383+
echo -e "##### END: ${com} #####\n" >>${logs_path}/mongodb_${psmdb_name}_${psmdb_replset}.mongo
13761384
done
13771385
done
13781386
done

0 commit comments

Comments
 (0)