fix: fixed bugs

YarikRevich · Nov 29, 2024 · e636884 · e636884
1 parent 06cbf1f
commit e636884
Show file tree

Hide file tree

Showing 3 changed files with 114 additions and 0 deletions.
diff --git a/.../java/com/objectstorage/service/integration/temporatestorage/TemporateStorageService.java b/.../java/com/objectstorage/service/integration/temporatestorage/TemporateStorageService.java
@@ -112,9 +112,13 @@ public void process() throws TemporateStoragePeriodRetrievalFailureException {
                 return;
             }
 
+            StateService.getTransactionProcessorGuard().lock();
+
             try {
                 repositoryExecutor.beginTransaction();
             } catch (TransactionInitializationFailureException e) {
+                StateService.getTransactionProcessorGuard().unlock();
+
                 StateService.getTemporateStorageProcessorGuard().unlock();
 
                 telemetryService.increaseCloudServiceUploadRetries();
@@ -132,13 +136,17 @@ public void process() throws TemporateStoragePeriodRetrievalFailureException {
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     StateService.getTemporateStorageProcessorGuard().unlock();
 
                     logger.error(e2.getMessage());
 
                     return;
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 StateService.getTemporateStorageProcessorGuard().unlock();
 
                 logger.error(e1.getMessage());
@@ -162,13 +170,17 @@ public void process() throws TemporateStoragePeriodRetrievalFailureException {
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     StateService.getTemporateStorageProcessorGuard().unlock();
 
                     logger.error(e2.getMessage());
 
                     return;
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 StateService.getTemporateStorageProcessorGuard().unlock();
 
                 logger.error(e1.getMessage());
@@ -194,13 +206,17 @@ public void process() throws TemporateStoragePeriodRetrievalFailureException {
                     try {
                         repositoryExecutor.rollbackTransaction();
                     } catch (TransactionRollbackFailureException e2) {
+                        StateService.getTransactionProcessorGuard().unlock();
+
                         StateService.getTemporateStorageProcessorGuard().unlock();
 
                         logger.error(e2.getMessage());
 
                         return;
                     }
 
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     StateService.getTemporateStorageProcessorGuard().unlock();
 
                     logger.info(e1.getMessage());
@@ -217,13 +233,17 @@ public void process() throws TemporateStoragePeriodRetrievalFailureException {
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     StateService.getTemporateStorageProcessorGuard().unlock();
 
                     logger.error(e2.getMessage());
 
                     return;
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 StateService.getTemporateStorageProcessorGuard().unlock();
 
                 logger.error(e1.getMessage());
@@ -234,6 +254,8 @@ public void process() throws TemporateStoragePeriodRetrievalFailureException {
             try {
                 repositoryExecutor.commitTransaction();
             } catch (TransactionCommitFailureException e) {
+                StateService.getTransactionProcessorGuard().unlock();
+
                 StateService.getTemporateStorageProcessorGuard().unlock();
 
                 telemetryService.increaseCloudServiceUploadRetries();
@@ -243,6 +265,8 @@ public void process() throws TemporateStoragePeriodRetrievalFailureException {
                 return;
             }
 
+            StateService.getTransactionProcessorGuard().unlock();
+
             telemetryService.increaseCurrentCloudServiceUploads();
 
             StateService.getTemporateStorageProcessorGuard().unlock();

diff --git a/api-server/src/main/java/com/objectstorage/service/processor/ProcessorService.java b/api-server/src/main/java/com/objectstorage/service/processor/ProcessorService.java
@@ -6,6 +6,7 @@
 import com.objectstorage.model.*;
 import com.objectstorage.repository.executor.RepositoryExecutor;
 import com.objectstorage.repository.facade.RepositoryFacade;
+import com.objectstorage.service.state.StateService;
 import com.objectstorage.service.telemetry.TelemetryService;
 import com.objectstorage.service.vendor.VendorFacade;
 import com.objectstorage.service.vendor.common.VendorConfigurationHelper;
@@ -101,9 +102,13 @@ public ContentRetrievalResult retrieveContent(ValidationSecretsApplication valid
      */
     public void apply(ContentApplication contentApplication, ValidationSecretsApplication validationSecretsApplication)
             throws ProcessorContentApplicationFailureException {
+        StateService.getTransactionProcessorGuard().lock();
+
         try {
             repositoryExecutor.beginTransaction();
         } catch (TransactionInitializationFailureException e) {
+            StateService.getTransactionProcessorGuard().unlock();
+
             throw new ProcessorContentApplicationFailureException(e.getMessage());
         }
 
@@ -114,9 +119,13 @@ public void apply(ContentApplication contentApplication, ValidationSecretsApplic
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     throw new ProcessorContentApplicationFailureException(e2.getMessage());
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 throw new ProcessorContentApplicationFailureException(e1.getMessage());
             }
 
@@ -136,18 +145,26 @@ public void apply(ContentApplication contentApplication, ValidationSecretsApplic
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     throw new ProcessorContentApplicationFailureException(e2.getMessage());
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 throw new ProcessorContentApplicationFailureException(e1.getMessage());
             }
         }
 
         try {
             repositoryExecutor.commitTransaction();
         } catch (TransactionCommitFailureException e) {
+            StateService.getTransactionProcessorGuard().unlock();
+
             throw new ProcessorContentApplicationFailureException(e.getMessage());
         }
+
+        StateService.getTransactionProcessorGuard().unlock();
     }
 
     /**
@@ -159,9 +176,13 @@ public void apply(ContentApplication contentApplication, ValidationSecretsApplic
      */
     public void withdraw(ValidationSecretsApplication validationSecretsApplication)
             throws ProcessorContentWithdrawalFailureException {
+        StateService.getTransactionProcessorGuard().lock();
+
         try {
             repositoryExecutor.beginTransaction();
         } catch (TransactionInitializationFailureException e) {
+            StateService.getTransactionProcessorGuard().unlock();
+
             throw new ProcessorContentWithdrawalFailureException(e.getMessage());
         }
 
@@ -174,9 +195,13 @@ public void withdraw(ValidationSecretsApplication validationSecretsApplication)
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     throw new ProcessorContentWithdrawalFailureException(e2.getMessage());
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 throw new ProcessorContentWithdrawalFailureException(e1.getMessage());
             }
 
@@ -186,9 +211,13 @@ public void withdraw(ValidationSecretsApplication validationSecretsApplication)
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     throw new ProcessorContentWithdrawalFailureException(e2.getMessage());
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 throw new ProcessorContentWithdrawalFailureException(e1.getMessage());
             }
 
@@ -208,18 +237,26 @@ public void withdraw(ValidationSecretsApplication validationSecretsApplication)
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     throw new ProcessorContentWithdrawalFailureException(e2.getMessage());
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 throw new ProcessorContentWithdrawalFailureException(e1.getMessage());
             }
         }
 
         try {
             repositoryExecutor.commitTransaction();
         } catch (TransactionCommitFailureException e) {
+            StateService.getTransactionProcessorGuard().unlock();
+
             throw new ProcessorContentWithdrawalFailureException(e.getMessage());
         }
+
+        StateService.getTransactionProcessorGuard().unlock();
     }
 
     /**
@@ -235,9 +272,13 @@ public void uploadObject(String location, InputStream file, ValidationSecretsApp
             throws ProcessorContentUploadFailureException {
         logger.info(String.format("Uploading content at '%s' location", location));
 
+        StateService.getTransactionProcessorGuard().lock();
+
         try {
             repositoryExecutor.beginTransaction();
         } catch (TransactionInitializationFailureException e) {
+            StateService.getTransactionProcessorGuard().unlock();
+
             throw new ProcessorContentUploadFailureException(e.getMessage());
         }
 
@@ -253,9 +294,13 @@ public void uploadObject(String location, InputStream file, ValidationSecretsApp
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     throw new ProcessorContentUploadFailureException(e2.getMessage());
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 throw new ProcessorContentUploadFailureException(e1.getMessage());
             }
         }
@@ -266,17 +311,24 @@ public void uploadObject(String location, InputStream file, ValidationSecretsApp
             try {
                 repositoryExecutor.rollbackTransaction();
             } catch (TransactionRollbackFailureException e2) {
+                StateService.getTransactionProcessorGuard().unlock();
+
                 throw new ProcessorContentUploadFailureException(e2.getMessage());
             }
+            StateService.getTransactionProcessorGuard().unlock();
 
             throw new ProcessorContentUploadFailureException(e1.getMessage());
         }
 
         try {
             repositoryExecutor.commitTransaction();
         } catch (TransactionCommitFailureException e) {
+            StateService.getTransactionProcessorGuard().unlock();
+
             throw new ProcessorContentUploadFailureException(e.getMessage());
         }
+
+        StateService.getTransactionProcessorGuard().unlock();
     }
 
     /**
@@ -397,9 +449,13 @@ public void removeObject(
             throws ProcessorContentRemovalFailureException {
         logger.info(String.format("Removing content object of '%s' location", location));
 
+        StateService.getTransactionProcessorGuard().lock();
+
         try {
             repositoryExecutor.beginTransaction();
         } catch (TransactionInitializationFailureException e) {
+            StateService.getTransactionProcessorGuard().unlock();
+
             throw new ProcessorContentRemovalFailureException(e.getMessage());
         }
 
@@ -412,9 +468,13 @@ public void removeObject(
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     throw new ProcessorContentRemovalFailureException(e2.getMessage());
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 throw new ProcessorContentRemovalFailureException(e1.getMessage());
             }
 
@@ -426,9 +486,13 @@ public void removeObject(
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     throw new ProcessorContentRemovalFailureException(e2.getMessage());
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 throw new ProcessorContentRemovalFailureException(e1.getMessage());
             }
 
@@ -445,9 +509,13 @@ public void removeObject(
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     throw new ProcessorContentRemovalFailureException(e2.getMessage());
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 throw new ProcessorContentRemovalFailureException(e1.getMessage());
             }
 
@@ -462,9 +530,13 @@ public void removeObject(
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     throw new ProcessorContentRemovalFailureException(e2.getMessage());
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 throw new ProcessorContentRemovalFailureException(e1.getMessage());
             }
 
@@ -478,9 +550,13 @@ public void removeObject(
                 try {
                     repositoryExecutor.rollbackTransaction();
                 } catch (TransactionRollbackFailureException e2) {
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     throw new ProcessorContentRemovalFailureException(e2.getMessage());
                 }
 
+                StateService.getTransactionProcessorGuard().unlock();
+
                 throw new ProcessorContentRemovalFailureException(e1.getMessage());
             }
 
@@ -493,9 +569,13 @@ public void removeObject(
                     try {
                         repositoryExecutor.rollbackTransaction();
                     } catch (TransactionRollbackFailureException e2) {
+                        StateService.getTransactionProcessorGuard().unlock();
+
                         throw new ProcessorContentRemovalFailureException(e2.getMessage());
                     }
 
+                    StateService.getTransactionProcessorGuard().unlock();
+
                     throw new ProcessorContentRemovalFailureException(e1.getMessage());
                 }
             }
@@ -504,8 +584,12 @@ public void removeObject(
         try {
             repositoryExecutor.commitTransaction();
         } catch (TransactionCommitFailureException e) {
+            StateService.getTransactionProcessorGuard().unlock();
+
             throw new ProcessorContentRemovalFailureException(e.getMessage());
         }
+
+        StateService.getTransactionProcessorGuard().unlock();
     }
 
     /**