mbwaheed commented on a change in pull request #1055: SOLR-13932 Review 
directory locking and Blob interactions
URL: https://github.com/apache/lucene-solr/pull/1055#discussion_r356423239
 
 

 ##########
 File path: 
solr/core/src/java/org/apache/solr/store/blob/metadata/SharedStoreResolutionUtil.java
 ##########
 @@ -147,42 +139,53 @@ public static SharedMetadataResolutionResult 
resolveMetadata(ServerSideMetadata
     
     if (local == null) {
       // The shard index data does not exist locally. All we can do is pull.  
-      // We've computed blobFilesMissingLocally and localFilesMissingOnBlob is 
empty as it should be.
+      // We've computed blobFilesMissingLocally. localFilesMissingOnBlob is 
empty as it should be.
       return new 
SharedMetadataResolutionResult(localFilesMissingOnBlob.values(), 
blobFilesMissingLocally.values(), blobFilesMissingLocally.values(), false);
     }
 
-    boolean localConflictingWithBlob = false;
+    // If trying to pull files from Blob, make sure similarly named files do 
not already exist outside the current commit point
+    ImmutableSet<String> allLocalFiles = local.getAllFiles();
+
+    boolean downloadToNewDir = false;
 
 Review comment:
   Maybe pullToNewDir? I don't have a strong preference but it would be better 
remain
   consistent and use the same name here 
https://github.com/apache/lucene-solr/pull/1055/files?utf8=%E2%9C%93&diff=unified&w=1#diff-29111919397c5d8b89434d02aab74127R41.

----------------------------------------------------------------
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:
us...@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@lucene.apache.org
For additional commands, e-mail: issues-h...@lucene.apache.org

Reply via email to