svn commit: r1661506 - in /lucene/dev/trunk/solr/solrj/src: java/org/apache/solr/common/cloud/ZkConfigManager.java test/org/apache/solr/common/cloud/TestZkConfigManager.java

[ro...@apache.org]

Author: romseygeek
Date: Sun Feb 22 18:22:40 2015
New Revision: 1661506

URL: http://svn.apache.org/r1661506
Log:
SOLR-7125: Don't upload dotfiles

Modified:
    lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java
    lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java

Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java?rev=1661506&r1=1661505&r2=1661506&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/cloud/ZkConfigManager.java Sun Feb 22 18:22:40 2015
@@ -58,6 +58,9 @@ public class ZkConfigManager {
     Files.walkFileTree(rootPath, new SimpleFileVisitor<Path>(){
       @Override
       public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
+        String filename = file.getFileName().toString();
+        if (filename.startsWith("."))
+          return FileVisitResult.CONTINUE;
         String zkNode = zkPath + "/" + rootPath.relativize(file).toString();
         try {
           zkClient.makePath(zkNode, file.toFile(), false, true);
@@ -67,6 +70,11 @@ public class ZkConfigManager {
         }
         return FileVisitResult.CONTINUE;
       }
+
+      @Override
+      public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
+        return (dir.getFileName().toString().startsWith(".")) ? FileVisitResult.SKIP_SUBTREE : FileVisitResult.CONTINUE;
+      }
     });
   }
 

Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java?rev=1661506&r1=1661505&r2=1661506&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java (original)
+++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkConfigManager.java Sun Feb 22 18:22:40 2015
@@ -71,6 +71,9 @@ public class TestZkConfigManager extends
       Files.createFile(tempConfig.resolve("file2"));
       Files.createDirectory(tempConfig.resolve("subdir"));
       Files.createFile(tempConfig.resolve("subdir").resolve("file3"));
+      Files.createFile(tempConfig.resolve(".ignored"));
+      Files.createDirectory(tempConfig.resolve(".ignoreddir"));
+      Files.createFile(tempConfig.resolve(".ignoreddir").resolve("ignored"));
 
       configManager.uploadConfigDir(tempConfig, "testconfig");
 
@@ -86,6 +89,9 @@ public class TestZkConfigManager extends
       assertTrue(Files.exists(downloadPath.resolve("file2")));
       assertTrue(Files.isDirectory(downloadPath.resolve("subdir")));
       assertTrue(Files.exists(downloadPath.resolve("subdir/file3")));
+      // dotfiles should be ignored
+      assertFalse(Files.exists(downloadPath.resolve(".ignored")));
+      assertFalse(Files.exists(downloadPath.resolve(".ignoreddir/ignored")));
       byte[] checkdata = Files.readAllBytes(downloadPath.resolve("file1"));
       assertArrayEquals(testdata, checkdata);