set target bucket versioning bug fix (#3)

infinistor · Mar 10, 2022 · 8177419 · 8177419
1 parent ad9a0df
commit 8177419
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 12 deletions.
diff --git a/src/main/java/ifs_mover/ObjectMover.java b/src/main/java/ifs_mover/ObjectMover.java
@@ -32,6 +32,7 @@
 import com.amazonaws.AmazonClientException;
 import com.amazonaws.AmazonServiceException;
 import com.amazonaws.SdkClientException;
+import com.amazonaws.services.s3.model.BucketVersioningConfiguration;
 import com.amazonaws.services.s3.model.ObjectMetadata;
 import com.amazonaws.services.s3.model.PartETag;
 import com.amazonaws.services.s3.model.Tag;
@@ -144,7 +145,8 @@ public void init() {
 		}
 
 		// check source bucket versioning
-		if (sourceRepository.getVersioning()) {
+		if (sourceRepository.isVersioning()) {
+			isVersioning = true;
 			targetRepository.setVersioning();
 		}
 
@@ -281,12 +283,10 @@ public void moveObjects() {
 						long size = failedJob.get(DBManager.MOVE_OBJECTS_TABLE_COLUMN_SIZE).longValue();
 						DBManager.updateJobFailedInfo(jobId, size);
 					}
-	
+
 					if (isVersioning) {
 						try {
-							if (sourceRepository.getVersioning()) {
-								targetRepository.setVersioning();
-							}
+							targetRepository.setBucketVersioning(sourceRepository.getVersioningStatus());
 						} catch (AmazonServiceException ase) {
 							logger.warn("{} {}", ase.getErrorCode(), ase.getErrorMessage());
 						} catch (SdkClientException  ace) {

diff --git a/src/main/java/ifs_mover/repository/IfsFile.java b/src/main/java/ifs_mover/repository/IfsFile.java
@@ -204,7 +204,7 @@ private void objectListRerun(String dirPath) {
     }
 
     @Override
-    public boolean getVersioning() {
+    public boolean isVersioning() {
         return false;
     }
 
@@ -266,4 +266,10 @@ public ObjectData getObject(String bucket, String key, String versionId) {
     public ObjectData getObject(String bucket, String key, String versionId, long start, long end) {
         return null;
     }
+
+    @Override
+    public String getVersioningStatus() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }
diff --git a/src/main/java/ifs_mover/repository/IfsS3.java b/src/main/java/ifs_mover/repository/IfsS3.java
@@ -65,6 +65,7 @@ public class IfsS3 implements Repository, S3 {
     private boolean isAWS;
     private boolean isSecure;
 	private boolean isVersioning;
+	private String versioningStatus;
     private AmazonS3 client;
 	private String errCode;
 	private String errMessage;
@@ -417,9 +418,10 @@ public int init(String type) {
     }
 
 	@Override
-	public boolean getVersioning() {
+	public boolean isVersioning() {
 		try {
 			versionConfig = client.getBucketVersioningConfiguration(config.getBucket());
+			versioningStatus = versionConfig.getStatus();
 			if (versionConfig.getStatus().equals(BucketVersioningConfiguration.OFF)) {
 				isVersioning = false;
 			} else {
@@ -726,8 +728,16 @@ public String setTargetPrefix(String path) {
     }
 
 	@Override
-	public void setBucketVersioning(String bucket, String status) {
-
+	public void setBucketVersioning(String status) {
+		if (status == null) {
+			return;
+		}
+
+		if (status.equals(BucketVersioningConfiguration.SUSPENDED)) {
+			client.setBucketVersioningConfiguration(new SetBucketVersioningConfigurationRequest(config.getBucket(), 
+				new BucketVersioningConfiguration(BucketVersioningConfiguration.SUSPENDED)));
+			logger.info("set target bucket({}) versioning is Suspended", config.getBucket());
+		}
 	}
 
 	@Override
@@ -828,4 +838,14 @@ public void deleteObject(String bucket, String key, String versionId) {
 			client.deleteObject(bucket, key);
 		}
 	}
+
+	@Override
+	public String getVersioningStatus() {
+		if (versioningStatus == null) {
+			versionConfig = client.getBucketVersioningConfiguration(config.getBucket());
+			versioningStatus = versionConfig.getStatus();
+		}
+
+		return versioningStatus;
+	}
 }
diff --git a/src/main/java/ifs_mover/repository/Repository.java b/src/main/java/ifs_mover/repository/Repository.java
@@ -45,7 +45,8 @@ public interface Repository {
     void setConfig(Config config, boolean isSource);
     int check(String type);
     int init(String type);
-    boolean getVersioning();
+    boolean isVersioning();
+    String getVersioningStatus();
 
     List<String> getBucketList();
     boolean createBuckets(List<String> list);

diff --git a/src/main/java/ifs_mover/repository/S3.java b/src/main/java/ifs_mover/repository/S3.java
@@ -18,7 +18,7 @@
 
 public interface S3 {
     void setVersioning();
-    void setBucketVersioning(String bucket, String status);
+    void setBucketVersioning(String status);
     String startMultipart(String bucket, String key);
     String uploadPart(String bucket, String key, String uploadId, InputStream is, int partNumber, long partSize);
     String completeMultipart(String bucket, String key, String uploadId, List<PartETag> list);

diff --git a/src/main/java/ifs_mover/repository/Swift.java b/src/main/java/ifs_mover/repository/Swift.java
@@ -276,7 +276,7 @@ public int init(String type) {
     }
 
     @Override
-    public boolean getVersioning() {
+    public boolean isVersioning() {
         return false;
     }
 
@@ -639,4 +639,10 @@ public ObjectData getObject(String bucket, String key, String versionId, long st
 
         return data;
     }
+
+    @Override
+    public String getVersioningStatus() {
+        // TODO Auto-generated method stub
+        return null;
+    }
 }