Fixed issue of table-config-version not increasing during table cloning

ivakegg · Nov 19, 2019 · 9a6d726 · 9a6d726
1 parent a6fd57d
commit 9a6d726
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooCache.java
@@ -165,7 +165,7 @@ public void process(WatchedEvent event) {
       if (log.isTraceEnabled()) {
         log.trace("{}", event);
       }
-      setWatcherForTableConfigVersion(event);
+      setWatcherForTableConfigVersion(event.getPath());
 
       switch (event.getType()) {
         case NodeDataChanged:
@@ -177,7 +177,7 @@ public void process(WatchedEvent event) {
                   "ZCacheWatcher::processTableConfigurationItem failed to process a table configuration change");
               updateAllTableConfigurations();
               tableConfigWatcherSet = false;
-              setWatcherForTableConfigVersion(event);
+              setWatcherForTableConfigVersion(event.getPath());
             }
             break;
           }
@@ -315,18 +315,18 @@ private synchronized void updateAllTableConfigurations() {
      * worked when we watched all table configurations and we are just emulating it now using only
      * one watched node for all the configuration items - the "table-config-version node".
      *
-     * @param event
+     * @param zPath
      *          Contains a Zpath which the will be used to extract the accumulo instance id which
      *          will be used to create the Zpath to the table_config_version znode so a initial
      *          watcher can be put on it.
      */
-    private synchronized void setWatcherForTableConfigVersion(WatchedEvent event) {
+    private synchronized void setWatcherForTableConfigVersion(String zPath) {
 
-      if (event.getPath() == null || event.getPath().isEmpty())
+      if (zPath == null || zPath.isEmpty())
         return;
 
       if (!tableConfigWatcherSet) {
-        Matcher znodeMatcher = ZNODE_PATTERN.matcher(event.getPath());
+        Matcher znodeMatcher = ZNODE_PATTERN.matcher(zPath);
         if (znodeMatcher.matches()) {
           String pathPrefix = znodeMatcher.group(1);
           try {

diff --git a/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java b/core/src/main/java/org/apache/accumulo/fate/zookeeper/ZooUtil.java
@@ -29,6 +29,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;
@@ -400,6 +401,8 @@ public static boolean exists(ZooKeeperConnectionInfo info, String zPath)
   public static void recursiveCopyPersistent(ZooKeeperConnectionInfo info, String source,
       String destination, NodeExistsPolicy policy) throws KeeperException, InterruptedException {
     Stat stat = null;
+    Matcher tableConfigMatcher;
+
     if (!exists(info, source))
       throw KeeperException.create(Code.NONODE, source);
     if (exists(info, destination)) {
@@ -420,7 +423,16 @@ public static void recursiveCopyPersistent(ZooKeeperConnectionInfo info, String
     if (stat.getEphemeralOwner() == 0) {
       if (data == null)
         throw KeeperException.create(Code.NONODE, source);
+
       putPersistentData(info, destination, data, policy);
+
+      // The clone table operation doesn't use TablePropUtil.setTableProperty but we still need to
+      // update the table-config-version znode.
+      tableConfigMatcher = ZooCache.TABLE_SETTING_CONFIG_PATTERN.matcher(destination);
+      if (tableConfigMatcher.matches())
+        putPersistentData(info, tableConfigMatcher.group(1) + Constants.ZTABLE_CONFIG_VERSION,
+            destination.getBytes(), policy);
+
       if (stat.getNumChildren() > 0) {
         List<String> children;
         final Retry retry = RETRY_FACTORY.createRetry();

diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/TablePropUtil.java b/server/base/src/main/java/org/apache/accumulo/server/util/TablePropUtil.java
@@ -96,7 +96,7 @@ private static String getTablePath(String zkRoot, TableId tableId) {
    *           If the putPersistant data call this exception may be thrown
    */
 
-  private static void updateTableConfigTrackingZnode(String zPath, ZooReaderWriter zoo)
+  public static void updateTableConfigTrackingZnode(String zPath, ZooReaderWriter zoo)
       throws KeeperException, InterruptedException {
 
     String pathPrefix;