[GitHub] [accumulo] arvindshmicrosoft commented on a change in pull request #1555: Fix idempotency bug in importtable

[GitBox <gi...@apache.org>]

arvindshmicrosoft commented on a change in pull request #1555: Fix idempotency bug in importtable
URL: https://github.com/apache/accumulo/pull/1555#discussion_r390054590
 
 

 ##########
 File path: server/master/src/main/java/org/apache/accumulo/master/tableOps/MoveExportedFiles.java
 ##########
 @@ -48,17 +49,22 @@
 
       Map<String,String> fileNameMappings = PopulateMetadataTable.readMappingFile(fs, tableInfo);
 
+      FileStatus[] exportedFiles = fs.listStatus(new Path(tableInfo.exportDir));
+      FileStatus[] importedFiles = fs.listStatus(new Path(tableInfo.importDir));
+
       for (String oldFileName : fileNameMappings.keySet()) {
-        if (!fs.exists(new Path(tableInfo.exportDir, oldFileName))) {
-          throw new AcceptableThriftTableOperationException(tableInfo.tableId, tableInfo.tableName,
-              TableOperation.IMPORT, TableOperationExceptionType.OTHER,
-              "File referenced by exported table does not exists " + oldFileName);
+        if (Arrays.stream(exportedFiles).filter(fstat ->
+            fstat.getPath().getName().equals(oldFileName)).count() != 1) {
+          if (Arrays.stream(importedFiles).filter(fstat ->
+              fstat.getPath().getName().equals(fileNameMappings.get(oldFileName))).count() != 1) {
+            throw new AcceptableThriftTableOperationException(tableInfo.tableId, tableInfo.tableName,
+                TableOperation.IMPORT, TableOperationExceptionType.OTHER,
+                "File referenced by exported table does not exist " + oldFileName);
+          }
 
 Review comment:
   Thank you Christopher! I did implement this and have it as a viable option - but I would like to evaluate Keith's suggestion as well before finalizing.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services