Merge pull request #844 from DataVault/DS-LUC070-147-20241119

DS- LUC070-147-20241119 Remove TSM delete functionality
DataVault · Nov 20, 2024 · 592ebad · 592ebad
2 parents a3eb1c7 + 0c36eca
commit 592ebad
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 16 deletions.
diff --git a/...-common/src/main/java/org/datavaultplatform/common/storage/impl/TivoliStorageManager.java b/...-common/src/main/java/org/datavaultplatform/common/storage/impl/TivoliStorageManager.java
@@ -208,16 +208,16 @@ public Verify.Method getVerifyMethod() {
     public void delete(String depositId, File working, Progress progress, String optFilePath) throws Exception {
 		Path depositDirectoryPath = getDepositDirectoryPath(depositId);
 		Path tsmFilePath = depositDirectoryPath.resolve(working.getName());
-		log.info("Delete [{}]",tsmFilePath);
-		ProcessHelper.ProcessInfo info = getProcessInfo("tsmDelete", 
-				"dsmc", "delete", "archive", tsmFilePath.toString(), "-noprompt", "-optfile=" + optFilePath);
-		if (info.wasFailure()) {
-			String errMessage = String.format("Delete of [%s] failed.", tsmFilePath);
-			logProcessOutput(info, errMessage);
-			throw new Exception(errMessage);
-		} else {
-			log.info("Delete of [{}] was Successful.", tsmFilePath);
-		}
+		log.info("TSM Delete [{}] skipping",tsmFilePath);
+		//ProcessHelper.ProcessInfo info = getProcessInfo("tsmDelete",
+		//		"dsmc", "delete", "archive", tsmFilePath.toString(), "-noprompt", "-optfile=" + optFilePath);
+		//if (info.wasFailure()) {
+		//	String errMessage = String.format("Delete of [%s] failed.", tsmFilePath);
+		//	logProcessOutput(info, errMessage);
+		//	throw new Exception(errMessage);
+		//} else {
+		//	log.info("Delete of [{}] was Successful.", tsmFilePath);
+		//}
     }
 
 	/*

diff --git a/...mon/src/test/java/org/datavaultplatform/common/storage/impl/TivoliStorageManagerTest.java b/...mon/src/test/java/org/datavaultplatform/common/storage/impl/TivoliStorageManagerTest.java
@@ -308,8 +308,10 @@ void setup() throws IOException {
             props.put(PropNames.OPTIONS_DIR, "/tmp/opt");
             tsm = Mockito.spy(new TivoliStorageManager("testTSM", props));
         }
-
-        @Test
+
+        // Removed as TSM deletes can never succeed for TSM since the move to write once tapes
+        // resulted in us not deleting them
+        /*@Test
         void testDeleteSucceeds() throws Exception {
             
             File fileToDelete = Files.createTempFile("test",".txt").toFile();
@@ -331,9 +333,11 @@ void testDeleteSucceeds() throws Exception {
 
             //Check that the local file has not been deleted. We are trying to delete file on TSM ONLY
             assertThat(fileToDelete).exists();
-        }
-
-        @Test
+        }*/
+
+        // Removed as TSM deletes can never fail for TSM since the move to write once tapes
+        // resulted in us not deleting them
+        /*@Test
         void testDeleteFails() throws Exception {
 
             File fileToDelete = Files.createTempFile("test",".txt").toFile();
@@ -361,7 +365,7 @@ void testDeleteFails() throws Exception {
 
             //Check that the local file has not been deleted. We are trying to delete file on TSM ONLY
             assertThat(fileToDelete).exists();
-        }
+        }*/
 
     }