From ce3073216670ef65f534aceced8e9f27f215e90b Mon Sep 17 00:00:00 2001
From: Luca Frosini <luca.frosini@isti.cnr.it>
Date: Thu, 12 Jan 2023 16:32:14 +0100
Subject: [PATCH] Improved error management

---
 .../analyser/SoftwareConceptAnalyser.java     |  3 +-
 .../ZenodoSoftwareVersionPublisher.java       | 47 ++++++++++++-------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/gcube/common/software/analyser/SoftwareConceptAnalyser.java b/src/main/java/org/gcube/common/software/analyser/SoftwareConceptAnalyser.java
index b48f528..e8a0edd 100644
--- a/src/main/java/org/gcube/common/software/analyser/SoftwareConceptAnalyser.java
+++ b/src/main/java/org/gcube/common/software/analyser/SoftwareConceptAnalyser.java
@@ -3,6 +3,7 @@ package org.gcube.common.software.analyser;
 import java.io.File;
 import java.net.URL;
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 import org.gcube.com.fasterxml.jackson.databind.JsonNode;
 import org.gcube.com.fasterxml.jackson.databind.ObjectMapper;
@@ -115,7 +116,7 @@ public class SoftwareConceptAnalyser {
 						concept.put(SoftwareConcept.DOI_URL_PROPERTY_NAME, doiURL.toString());
 					}
 				}
-				
+				Thread.sleep(TimeUnit.SECONDS.toMillis(2));
 			}
 		} catch (Exception e) {
 			for(int j=i+1; j<versions.size(); j++) {
diff --git a/src/main/java/org/gcube/common/software/process/publish/zenodo/ZenodoSoftwareVersionPublisher.java b/src/main/java/org/gcube/common/software/process/publish/zenodo/ZenodoSoftwareVersionPublisher.java
index 801c47f..503e2e8 100644
--- a/src/main/java/org/gcube/common/software/process/publish/zenodo/ZenodoSoftwareVersionPublisher.java
+++ b/src/main/java/org/gcube/common/software/process/publish/zenodo/ZenodoSoftwareVersionPublisher.java
@@ -160,23 +160,36 @@ public class ZenodoSoftwareVersionPublisher extends SoftwareVersionPublisher {
 			Thread.sleep(TimeUnit.SECONDS.toMillis(1));
 		}
 		
-		//Add depositionFiles
-		addFilesToDeposition(files);
-		
-		//Update deposit metadata
-		updateMetadata();
-		
-		// Publish the version
-		publishToZenodo();
-		
-		for(File file : files) {
-			if(!file.exists()) {
-	        	throw new RuntimeException(file.getAbsolutePath() + "does not exist");
-	        }
-			try {
-				while(!file.delete()) {}
-			}catch (Exception e) {
-				logger.error("Unable to delete ", file.getAbsolutePath());
+		try {
+			//Add depositionFiles
+			addFilesToDeposition(files);
+			
+			//Update deposit metadata
+			updateMetadata();
+			
+			// Publish the version
+			publishToZenodo();
+		}finally {
+			for(File file : files) {
+				if(!file.exists()) {
+		        	throw new RuntimeException(file.getAbsolutePath() + " does not exist");
+		        }
+				try {
+					int i = 0;
+					while(!file.delete() && i<10) {
+						int millis = 100;
+						logger.warn("File {} not deleted at the attemp {}. Retrying in {} milliseconds.", file.getAbsolutePath(), i+1, millis);
+						++i;
+						Thread.sleep(millis);
+					}
+					
+					if(i==10) {
+						logger.warn("After {} attemps the file {} was not deleted. Trying using deleteOnExit().", i, file.getAbsolutePath());
+						file.deleteOnExit();
+					}
+				}catch (Exception e) {
+					logger.error("Unable to delete {}", file.getAbsolutePath());
+				}
 			}
 		}
 	}