debug

Signed-off-by: Yuji Ito <[email protected]>

Author: llamerada-jp

test/e2e/Makefile

@@ -88,10 +88,10 @@ create-loop-dev:
 setup-fin-volume: $(MINIKUBE_BIN) $(KUBECTL)
 	for node in $(MINIKUBE_PROFILE_NAME) $(MINIKUBE_PROFILE_NAME)-m02; do \
 		$(MINIKUBE) ssh -n $$node -- sudo dd if=/dev/zero of=fin-volume.img bs=1G seek=1 count=0; \
-		$(MINIKUBE) ssh -n $$node -- sudo losetup /dev/loop1 fin-volume.img || :; \
-		$(MINIKUBE) ssh -n $$node -- sudo mkfs.xfs /dev/loop1 || :; \
+		$(MINIKUBE) ssh -n $$node -- sudo losetup $(FIN_VOLUME_LOOP_DEV) fin-volume.img || :; \
+		$(MINIKUBE) ssh -n $$node -- sudo mkfs.xfs $(FIN_VOLUME_LOOP_DEV) || :; \
 		$(MINIKUBE) ssh -n $$node -- sudo mkdir -p /fin; \
-		$(MINIKUBE) ssh -n $$node -- sudo mount /dev/loop1 /fin; \
+		$(MINIKUBE) ssh -n $$node -- sudo mount $(FIN_VOLUME_LOOP_DEV) /fin; \
 		$(MINIKUBE) ssh -n $$node -- sudo chown -R 10000:10000 /fin; \
 		$(MINIKUBE) ssh -n $$node -- ls -ld /fin; \
 	done
@@ -149,6 +149,7 @@ setup-components:
 	# Disable webhooks for e2e tests
 	$(KUBECTL) -n $(NS) set env deployment/fin-controller-manager ENABLE_WEBHOOKS=false
 	$(KUBECTL) patch deploy -n $(NS) fin-controller-manager --type='json' -p='[{"op": "add", "path": "/spec/template/spec/containers/0/args/-", "value":"--raw-img-expansion-unit-size=10485760"}]'
+	$(KUBECTL) wait -n $(NS) --timeout=60s --for=condition=available deployment/fin-controller-manager
 
 .PHONY: do-test
 do-test: $(GINKGO) $(KUBECTL) $(MINIKUBE_BIN)
@@ -157,4 +158,13 @@ do-test: $(GINKGO) $(KUBECTL) $(MINIKUBE_BIN)
 	E2ETEST=1 \
 	KUBECTL=$(KUBECTL) \
 	MINIKUBE=$(MINIKUBE) \
-	$(GINKGO) --fail-fast -v $(GINKGO_FLAGS) .
+	$(GINKGO) --fail-fast -v $(GINKGO_FLAGS) .; \
+	if [ "$$?" -ne 0 ]; then \
+		echo "pods"; \
+		$(KUBECTL) get pod -A; \
+		echo "deployments"; \
+		$(KUBECTL) get deploy -A; \
+		echo "Controller logs"; \
+		$(KUBECTL) -n rook-ceph logs deployment/fin-controller-manager; \
+		exit 1; \
+	fi

test/e2e/lock_test.go

@@ -10,7 +10,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 func lockTestSuite() {
@@ -26,8 +25,8 @@ func lockTestSuite() {
 		Expect(err).NotTo(HaveOccurred())
 
 		pvc = CreateBackupTargetPVC(ctx, k8sClient, ns, "Filesystem", rookStorageClass, "ReadWriteOnce", "100Mi")
-		pvc, err = WaitForPVCBound(ctx, ctrlClient, pvc, 1*time.Minute)
-		Expect(err).NotTo(HaveOccurred())
+		// Create a Pod to make filesystem to pass verification during backup
+		_ = CreatePodForFilesystemPVC(ctx, k8sClient, pvc)
 	})
 
 	It("should lock the volume", func(ctx SpecContext) {
@@ -49,13 +48,8 @@ func lockTestSuite() {
 		err = CreateFinBackup(ctx, ctrlClient, fb)
 		Expect(err).NotTo(HaveOccurred())
 
-		// renew fb to get UID
-		currentFB := &finv1.FinBackup{}
-		err = ctrlClient.Get(ctx, client.ObjectKeyFromObject(fb), currentFB)
-		Expect(err).NotTo(HaveOccurred())
-
 		err = WaitControllerLog(ctx,
-			"the volume is locked by another process.*"+string(currentFB.GetUID()),
+			"the volume is locked by another process.*"+fb.GetName(),
 			3*time.Minute)
 		Expect(err).NotTo(HaveOccurred())
 	})

test/e2e/util_test.go

@@ -378,19 +378,6 @@ func DeleteFinRestore(ctx context.Context, client client.Client, finrestore *fin
 	return client.Delete(ctx, target)
 }
 
-func WaitForPVCBound(ctx context.Context, c client.Client, pvc *corev1.PersistentVolumeClaim, timeout time.Duration) (*corev1.PersistentVolumeClaim, error) {
-	GinkgoHelper()
-	currentPVC := &corev1.PersistentVolumeClaim{}
-	err := wait.PollUntilContextTimeout(ctx, time.Second, timeout, true, func(ctx context.Context) (bool, error) {
-		err := c.Get(ctx, client.ObjectKeyFromObject(pvc), currentPVC)
-		if err != nil {
-			return false, err
-		}
-		return currentPVC.Status.Phase == corev1.ClaimBound, nil
-	})
-	return currentPVC, err
-}
-
 func WaitForFinBackupStoredToNodeAndVerified(ctx context.Context, c client.Client, finbackup *finv1.FinBackup, timeout time.Duration) (*finv1.FinBackup, error) {
 	GinkgoHelper()
 	currentFB := &finv1.FinBackup{}
@@ -510,6 +497,7 @@ func WaitControllerLog(ctx SpecContext, pattern string, duration time.Duration)
 			default:
 			}
 			line := scanner.Text()
+			fmt.Println("⚠️ ", line)
 			if matcher.MatchString(line) {
 				close(found)
 				return
@@ -755,7 +743,12 @@ func GetNodeNames(ctx context.Context, k8sClient kubernetes.Interface) ([]string
 func GetPvByPvc(ctx context.Context, k8sClient kubernetes.Interface, pvc *corev1.PersistentVolumeClaim) (*corev1.PersistentVolume, error) {
 	GinkgoHelper()
 
-	return k8sClient.CoreV1().PersistentVolumes().Get(ctx, pvc.Spec.VolumeName, metav1.GetOptions{})
+	currentPVC, err := k8sClient.CoreV1().PersistentVolumeClaims(pvc.Namespace).Get(ctx, pvc.Name, metav1.GetOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	return k8sClient.CoreV1().PersistentVolumes().Get(ctx, currentPVC.Spec.VolumeName, metav1.GetOptions{})
 }
 
 func ListRBDSnapshots(ctx context.Context, poolName, imageName string) ([]*model.RBDSnapshot, error) {