From 1b5d41b22f2a30740c52894ddd8361e56d1fa806 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 22 Sep 2021 09:52:52 +0200 Subject: [PATCH 1/6] add try catch in order to manage a close failure --- .../datatransfer/resolver/services/StorageIDResolver.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java index cac6917..7884d8f 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java @@ -345,7 +345,11 @@ public class StorageIDResolver { else { if(!Objects.isNull(storageManagerClient)) { LOG.debug("going to close an old storage-client instance"); - storageManagerClient.forceClose(); + try { + storageManagerClient.forceClose(); + }catch(Exception e) { + LOG.warn("Some problem occurred during the close operation:"+e.getMessage()+" Going to open another connection"); + } } LOG.debug("initializing a new storage-client instance"); storageManagerClient=new StorageClient(StorageIDResolver.class.getName(), StorageIDResolver.class.getSimpleName(), STORAGEID_RESOLVER, STORAGE_ACCESS_TYPE, memory, STORAGE_BACKEND_TYPE).getClient(); -- 2.17.1 From dde4ff1fa8d516d9c4627b42c5977980936f279f Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 22 Sep 2021 10:00:15 +0200 Subject: [PATCH 2/6] add debug log line --- .../gcube/datatransfer/resolver/services/StorageIDResolver.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java index 7884d8f..74d8b5d 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java @@ -347,6 +347,7 @@ public class StorageIDResolver { LOG.debug("going to close an old storage-client instance"); try { storageManagerClient.forceClose(); + LOG.debug("storage-client closed"); }catch(Exception e) { LOG.warn("Some problem occurred during the close operation:"+e.getMessage()+" Going to open another connection"); } -- 2.17.1 From b63ad747300249a5fef841327b6de2bac054ba72 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 22 Sep 2021 10:20:00 +0200 Subject: [PATCH 3/6] add debug log line --- .../resolver/services/StorageIDResolver.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java index 74d8b5d..f029e10 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java @@ -340,11 +340,12 @@ public class StorageIDResolver { * @return the storage client instance */ protected static IClient getStorageClientInstance(MemoryType memory) { - if ((!Objects.isNull(storageManagerClient)) && (storageManagerClient.getGcubeMemoryType().equals(memory))) + if ((!Objects.isNull(storageManagerClient)) && (storageManagerClient.getGcubeMemoryType().equals(memory))) { + LOG.debug("reusing the same storage-client object"); return storageManagerClient; - else { + }else { if(!Objects.isNull(storageManagerClient)) { - LOG.debug("going to close an old storage-client instance"); + LOG.debug("going to close an old storage-client instance on "+storageManagerClient.getGcubeMemoryType()); try { storageManagerClient.forceClose(); LOG.debug("storage-client closed"); @@ -352,7 +353,7 @@ public class StorageIDResolver { LOG.warn("Some problem occurred during the close operation:"+e.getMessage()+" Going to open another connection"); } } - LOG.debug("initializing a new storage-client instance"); + LOG.debug("initializing a new storage-client instance on "+memory); storageManagerClient=new StorageClient(StorageIDResolver.class.getName(), StorageIDResolver.class.getSimpleName(), STORAGEID_RESOLVER, STORAGE_ACCESS_TYPE, memory, STORAGE_BACKEND_TYPE).getClient(); return storageManagerClient; } -- 2.17.1 From 9c493501f86dfabb287e8b34ea80164d99c1fd44 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Wed, 22 Sep 2021 10:46:39 +0200 Subject: [PATCH 4/6] convert from storage-core memoryType to storage-wrapper memoryType --- .../gcube/datatransfer/resolver/services/StorageIDResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java index f029e10..bdb8832 100644 --- a/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java +++ b/src/main/java/org/gcube/datatransfer/resolver/services/StorageIDResolver.java @@ -340,7 +340,7 @@ public class StorageIDResolver { * @return the storage client instance */ protected static IClient getStorageClientInstance(MemoryType memory) { - if ((!Objects.isNull(storageManagerClient)) && (storageManagerClient.getGcubeMemoryType().equals(memory))) { + if ((!Objects.isNull(storageManagerClient)) && (storageManagerClient.getGcubeMemoryType().toString() == memory.toString())) { LOG.debug("reusing the same storage-client object"); return storageManagerClient; }else { -- 2.17.1 From d5f6afc2c92c30bd5a4a92817a7a27466d26e2ee Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 7 Oct 2021 10:55:06 +0200 Subject: [PATCH 5/6] update storage-manager range to [3,4) accordingly to #22159 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index be4fa8e..27f89cb 100644 --- a/pom.xml +++ b/pom.xml @@ -58,13 +58,13 @@ org.gcube.contentmanagement storage-manager-wrapper - [2.6.1-SNAPSHOT, 3.0.0-SNAPSHOT) + [3.0.0-SNAPSHOT, 4.0.0-SNAPSHOT) org.gcube.contentmanagement storage-manager-core - [2.0.0,3.0.0-SNAPSHOT) + [3.0.0,4.0.0-SNAPSHOT) slf4j-nop -- 2.17.1 From a17553d64286905d38e7a1a51ece77df97ad8587 Mon Sep 17 00:00:00 2001 From: Roberto Cirillo Date: Thu, 7 Oct 2021 11:02:15 +0200 Subject: [PATCH 6/6] fix wrong range --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 27f89cb..3549538 100644 --- a/pom.xml +++ b/pom.xml @@ -64,7 +64,7 @@ org.gcube.contentmanagement storage-manager-core - [3.0.0,4.0.0-SNAPSHOT) + [3.0.0-SNAPSHOT,4.0.0-SNAPSHOT) slf4j-nop -- 2.17.1