add some debug logs

Signed-off-by: Yuji Ito <llamerada.jp@gmail.com>

Author: llamerada-jp

test/e2e/Makefile

@@ -329,10 +329,28 @@ do-test-multik8s: $(GINKGO)
 	$(GINKGO) --fail-fast -v $(GINKGO_FLAGS) multik8s; \
 	if [ "$$?" -ne 0 ]; then \
 		echo "Controller logs for $(MINIKUBE_PROFILE_PRIMARY):"; \
-		$${KUBECTL_PRIMARY} logs --tail 100 -n $(CEPH_CLUSTER1_NAMESPACE) -l app.kubernetes.io/name=mantle -c mantle; \
+		$${KUBECTL_PRIMARY} logs --tail 1000 -n $(CEPH_CLUSTER1_NAMESPACE) -l app.kubernetes.io/name=mantle -c mantle; \
 		echo ""; \
 		echo "Controller logs for $(MINIKUBE_PROFILE_SECONDARY):"; \
-		$${KUBECTL_SECONDARY}  logs --tail 100 -n $(CEPH_CLUSTER1_NAMESPACE) -l app.kubernetes.io/name=mantle -c mantle; \
+		$${KUBECTL_SECONDARY}  logs --tail 1000 -n $(CEPH_CLUSTER1_NAMESPACE) -l app.kubernetes.io/name=mantle -c mantle; \
+		echo ""; \
+		echo "Primary MBs"; \
+		$${KUBECTL_PRIMARY} get mantlebackups -A -o yaml; \
+		echo ""; \
+		echo "Secondary MBs"; \
+		$${KUBECTL_SECONDARY} get mantlebackups -A -o yaml; \
+		echo ""; \
+		echo "Primary PVCs"; \
+		$${KUBECTL_PRIMARY} get pvc -A -o yaml; \
+		echo ""; \
+		echo "Secondary PVCs"; \
+		$${KUBECTL_SECONDARY} get pvc -A -o yaml; \
+		echo ""; \
+		echo "Primary PVs"; \
+		$${KUBECTL_PRIMARY} get pv -o yaml; \
+		echo ""; \
+		echo "Secondary PVs"; \
+		$${KUBECTL_SECONDARY} get pv -o yaml; \
 		# Explicitly fail the test to mark the CI job as failed. \
 		exit 1; \
 	fi

test/e2e/multik8s/testutil/util.go

@@ -468,6 +468,7 @@ func CreatePod(cluster int, namespace, podName, pvcName string) {
 }
 
 func CreatePVC(ctx SpecContext, cluster int, namespace, name string) {
+	GinkgoHelper()
 	Eventually(ctx, func() error {
 		return applyPVCTemplate(cluster, namespace, name)
 	}).Should(Succeed())
@@ -493,15 +494,15 @@ func WriteRandomDataToPV(ctx SpecContext, cluster int, namespace, pvcName string
 
 func CreateMantleBackup(cluster int, namespace, pvcName, backupName string) {
 	GinkgoHelper()
-	By("creating a MantleBackup object")
+	By(fmt.Sprintf("creating a MantleBackup object @%d:%s/%s", cluster, namespace, backupName))
 	Eventually(func() error {
 		return ApplyMantleBackupTemplate(cluster, namespace, pvcName, backupName)
 	}).Should(Succeed())
 }
 
 func CreateMantleBackupConfig(cluster int, namespace, pvcName, backupConfigName string) {
 	GinkgoHelper()
-	By("creating a MantleBackupConfig object")
+	By(fmt.Sprintf("creating a MantleBackupConfig object @%d:%s/%s for %s", cluster, namespace, backupConfigName, pvcName))
 	Eventually(func() error {
 		return ApplyMantleBackupConfigTemplate(cluster, namespace, pvcName, backupConfigName)
 	}).Should(Succeed())