fixed enclave dump for dead encalves

kurtosis-tech · Feb 8, 2024 · 01cb5d1 · 01cb5d1
1 parent a250c42
commit 01cb5d1
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 8 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -895,7 +895,7 @@ jobs:
 
       # Check Dump Contains files
       - run: "${KURTOSIS_BINPATH} enclave dump test-enclave test-dump"
-      - run: "cat test-dump/files/rendered-file"
+      - run: "ls test-dump/files/rendered-file"
 
       # Module inside an enclave
       - run: "${KURTOSIS_BINPATH} enclave ls"

diff --git a/cli/cli/commands/enclave/dump/dump.go b/cli/cli/commands/enclave/dump/dump.go
@@ -85,22 +85,29 @@ func run(
 		return stacktrace.Propagate(err, "An error occurred creating Kurtosis Context from local engine")
 	}
 
-	enclaveCtx, err := kurtosisCtx.GetEnclaveContext(ctx, enclaveIdentifier)
-	if err != nil {
-		return stacktrace.Propagate(err, "an error occurred while retrieving enclave context for enclave")
-	}
-
-	enclaveUuid := enclaveCtx.GetEnclaveUuid()
+	enclaveInfo, err := kurtosisCtx.GetEnclave(ctx, enclaveIdentifier)
 
+	enclaveUuid := enclaveInfo.GetEnclaveUuid()
 	if enclaveOutputDirpath == defaultEnclaveDumpDir {
-		enclaveName := enclaveCtx.GetEnclaveName()
+		enclaveName := enclaveInfo.GetName()
 		enclaveOutputDirpath = fmt.Sprintf("%s%s%s", enclaveName, enclaveDumpSeparator, enclaveUuid)
 	}
 
 	if err := kurtosisBackend.DumpEnclave(ctx, enclave.EnclaveUUID(enclaveUuid), enclaveOutputDirpath); err != nil {
 		return stacktrace.Propagate(err, "An error occurred dumping enclave '%v' to '%v'", enclaveIdentifier, enclaveOutputDirpath)
 	}
 
+	if enclaveInfo.ApiContainerStatus != kurtosis_engine_rpc_api_bindings.EnclaveAPIContainerStatus_EnclaveAPIContainerStatus_RUNNING {
+		logrus.Debugf("Couldn't dump file information as the enclave '%v' is not running", enclaveIdentifier)
+		logrus.Infof("Dumped enclave '%v' to directory '%v'", enclaveIdentifier, enclaveOutputDirpath)
+		return nil
+	}
+
+	enclaveCtx, err := kurtosisCtx.GetEnclaveContext(ctx, enclaveIdentifier)
+	if err != nil {
+		return stacktrace.Propagate(err, "an error occurred while retrieving enclave context for enclave")
+	}
+
 	filesInEnclave, err := enclaveCtx.GetAllFilesArtifactNamesAndUuids(ctx)
 	if err != nil {
 		return stacktrace.Propagate(err, "An error occurred while fetching files artifact in enclave '%v'", enclaveIdentifier)