add auth backup and auth restore #76

xuliguov5 · 2020-11-30T02:16:19Z

No description provided.

javeme · 2020-11-30T03:25:26Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+                    hugeTypes.add(HugeType.valueOf(type.toUpperCase()));
+                } catch (IllegalArgumentException e) {
+                    throw new ParameterException(String.format(
+                            "Invalid --type '%s', valid value is 'all' or " +


align with ParameterException

javeme · 2020-11-30T03:25:36Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+        @Override
+        public String convert(String value) {
+            E.checkArgument(value != null && !value.isEmpty(),
+                    "Strategy can't be null or empty");


javeme · 2020-11-30T03:26:16Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+                return value;
+            } else {
+                throw new ParameterException(String.format(
+                        "Invalid --strategy '%s', valid value is 'stop' or 'ignore", value));


align with ParameterException, and ensure don't exceed 80 chars

javeme · 2020-11-30T03:26:55Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupManager.java

+                    break;
+                default:
+                    throw new AssertionError(String.format(
+                          "Bad backup type: %s", type));


align with AssertionError

javeme · 2020-11-30T03:27:07Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupManager.java

+    protected void backupUsers() {
+        Printer.print("Users backup started");
+        List<User> users = retry(this.client.authManager()::listUsers,
+                                "querying users of authority");


align with this

javeme · 2020-11-30T03:27:15Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupManager.java

+    protected void backupGroups() {
+        Printer.print("Groups backup started");
+        List<Group> groups = retry(this.client.authManager()::listGroups,
+                                  "querying groups of authority");


also check other places for alignment

javeme · 2020-11-30T03:29:16Z

src/main/java/com/baidu/hugegraph/manager/AuthRestoreManager.java

+    private int conflict_status = 0;
+    private AuthRestoreStrategy strategy;
+    private String initPassword;
+    /**


use "/*" here, "/**" is just for java doc

javeme · 2020-11-30T03:30:24Z

src/main/java/com/baidu/hugegraph/manager/AuthRestoreManager.java

+
+
+
+


remove empty lines

javeme · 2020-11-30T03:30:35Z

src/main/java/com/baidu/hugegraph/manager/AuthRestoreManager.java

+
+    }
+
+    public static void main(String[] strings) {


remove unused code

javeme · 2020-12-02T07:47:05Z

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

@@ -328,6 +337,22 @@ private void execute(String subCmd, JCommander jCommander) {
                Printer.print("Tasks are cleared[force=%s]",
                              taskClear.force());
                break;
+            case "auth-backup":
+                Printer.print("Auth backup start !");


"Auth backup start..."

javeme · 2020-12-02T07:47:14Z

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

+                authBackupManager.authBackup(authBackup.types());
+                break;
+            case "auth-restore":
+                Printer.print("Auth restore start !");


javeme · 2020-12-02T07:49:11Z

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

+            Printer.print("Exception in 'main' is %s", e);
+            System.exit(-1);
+        }
+        System.exit(0);


throw exception if test mode else System.exit(-1)

javeme · 2020-12-02T07:49:34Z

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

}
+

remove empty line

javeme · 2020-12-02T07:50:25Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+
+        @Parameter(names = {"--strategy"},
+                   converter = AuthStrategyConverter.class,
+                   description = "restore strategy, " +


improve description

javeme · 2020-12-02T07:54:57Z

src/test/java/com/baidu/hugegraph/test/functional/AuthTest.java

+    public static final String TRUST_STORE_PASSWORD = "";
+
+
+


remove unused line

javeme · 2020-12-02T07:55:05Z

src/test/java/com/baidu/hugegraph/test/functional/ClientUtil.java

+                                    .configSSL(trustStoreFile, trustStorePassword)
+                                    .build();
+    }
+


javeme · 2020-12-02T07:55:16Z

src/test/java/com/baidu/hugegraph/test/functional/FileUtil.java

+                }catch (Exception e) {
+                    Printer.print("Failed to close file");
+                }
+


javeme · 2020-12-02T07:56:12Z

src/test/java/com/baidu/hugegraph/test/functional/FileUtil.java

+        }finally {
+            if(is != null) {
+                try {
+                    is.close();


use try (resource) to auto close

javeme · 2020-12-02T07:56:34Z

src/test/java/com/baidu/hugegraph/test/functional/FileUtil.java

+            if(is != null) {
+                try {
+                    is.close();
+                }catch (Exception e) {


add space tp "}catch"

zhoney · 2020-12-02T09:11:37Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

-import com.beust.jcommander.ParameterException;
-import com.beust.jcommander.Parameters;
-import com.beust.jcommander.ParametersDelegate;
+import com.beust.jcommander.*;


don't use * in import

zhoney · 2020-12-02T09:12:47Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+
+import java.io.File;
+import java.io.IOException;
+import java.util.*;


put java.* and org.* first and put com.baidu.hugegraph last

zhoney · 2020-12-02T09:13:18Z

src/main/java/com/baidu/hugegraph/constant/AuthRestoreFlow.java

@@ -0,0 +1,30 @@
+/*


add apache license

zhoney · 2020-12-02T09:13:46Z

src/main/java/com/baidu/hugegraph/manager/AuthRestoreManager.java

+        }
+
+    }
+


delete empty line

zhoney · 2020-12-03T03:23:18Z

src/main/java/com/baidu/hugegraph/base/ToolClient.java

 import com.baidu.hugegraph.driver.GraphManager;
 import com.baidu.hugegraph.driver.GremlinManager;
 import com.baidu.hugegraph.driver.HugeClient;
 import com.baidu.hugegraph.driver.SchemaManager;
 import com.baidu.hugegraph.driver.TaskManager;
 import com.baidu.hugegraph.driver.TraverserManager;
+


delete empty line

zhoney · 2020-12-03T03:24:10Z

src/main/java/com/baidu/hugegraph/base/ToolClient.java

 import com.baidu.hugegraph.util.E;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.commons.lang3.StringUtils;
+
+import java.nio.file.Paths;


format imports

javeme · 2020-12-03T03:28:11Z

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

@@ -404,27 +430,95 @@ private GraphMode mode() {

    public static void main(String[] args) {
        HugeGraphCommand cmd = new HugeGraphCommand();
+
+        JCommander jCommander = parseJCommand(args, cmd);


rename to parseCommand and catch it

javeme · 2020-12-03T03:35:18Z

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

-            Printer.print("Must provide one sub-command");
-            jCommander.usage();
-            System.exit(-1);
+            printCommonCommand(jCommander);


printCommandsCategory

javeme · 2020-12-03T03:39:49Z

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

+        }
+        Printer.print("======================================");
+        Printer.print("You can use 'help' to see more detailed " +
+                      "\ncommands, such as './bin/hugegraph help'");


help
help sub-command

javeme · 2020-12-03T03:42:22Z

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

+             } else {
+                 System.out.println(" Unrecognized command : "
+                                    + info);
+             }


only print if type y else not, default is [n]

javeme · 2020-12-03T03:43:49Z

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

+    }
+
+    public static boolean isPrintStackException() {
+        System.out.println("Input yes or no to view the stack " +


Type y(yes) to print exception stack[default n]?

javeme · 2020-12-03T03:45:04Z

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

-import com.baidu.hugegraph.manager.GremlinManager;
-import com.baidu.hugegraph.manager.RestoreManager;
-import com.baidu.hugegraph.manager.TasksManager;
+import com.baidu.hugegraph.manager.*;


don't import *

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

javeme · 2020-12-03T03:50:40Z

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

        }
        try {
            jCommander.parse(args);
        } catch (ParameterException e) {
            Printer.print(e.getMessage());
-            System.exit(-1);
+            throw new ParameterException(String.format(
+                      "make sure your command, you can use " +


Unexpected command

javeme · 2020-12-03T04:23:58Z

src/main/java/com/baidu/hugegraph/cmd/HugeGraphCommand.java

+                System.exit(-1);
+            } else {
+                throw new RuntimeException(
+                          "Exception in 'main' is", e);


Failed to execute command

zhoney · 2020-12-07T09:55:19Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

-                                 "edge_label,property_key,index_label'")
+                   description = "Type of schema/data. Concat with ',' if more " +
+                                 "than one. other types include ‘all’ and ‘schema’" +
+                                 " .’all' means all vertices, edges and schema,in " +


add a blank after ","

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

zhoney · 2020-12-07T09:59:47Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+        @Parameter(names = {"--strategy"},
+                   converter = AuthStrategyConverter.class,
+                   description = "The strategy that needs to be chosen in the " +
+                                 "event of a conflict in restore. strategy include " +


Valid Strategies

zhoney · 2020-12-07T10:00:37Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+        public void initPassword(String initPassword) {
+            this.initPassword = initPassword;
+        }
+


delete empty line

zhoney · 2020-12-07T10:05:40Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupManager.java

@@ -0,0 +1,150 @@
+/*


add apache license

zhoney · 2020-12-07T10:20:16Z

src/main/java/com/baidu/hugegraph/manager/BackupRestoreBaseManager.java

-import com.baidu.hugegraph.base.Printer;
-import com.baidu.hugegraph.base.RetryManager;
-import com.baidu.hugegraph.base.ToolClient;
+import com.baidu.hugegraph.base.*;


don't import *

zhoney · 2020-12-07T10:21:01Z

src/main/java/com/baidu/hugegraph/manager/BackupRestoreBaseManager.java

-            while ((line = reader.readLine()) != null) {
-                consumer.accept(type.string(), line);
-            }
+             String line;


I think keep origin is ok

zhoney · 2020-12-07T10:22:02Z

src/main/java/com/baidu/hugegraph/util/ToolUtil.java

+
+public final class ToolUtil {
+
+    public static void shutdown(List<ToolManager> taskManager) {


taskManagers

zhoney · 2020-12-07T10:23:25Z

src/main/java/com/baidu/hugegraph/util/ToolUtil.java

+                                            boolean isTestNode) {
+        if (isTestNode) {
+            throw new ParameterException(
+                      "Failed to parse command");


throw new ParameterException("Failed to parse command");

zhoney · 2020-12-07T10:23:33Z

src/main/java/com/baidu/hugegraph/util/ToolUtil.java

+                                   boolean isTestNode) {
+        if (isTestNode) {
+            throw new ParameterException(
+                      "Failed to parse command");


zhoney · 2020-12-07T12:36:00Z

assembly/travis/conf/gremlin-server.yaml

+          com.baidu.hugegraph.traversal.algorithm.SubGraphTraverser,
+          com.baidu.hugegraph.traversal.optimize.Text,
+          com.baidu.hugegraph.traversal.optimize.TraversalUtil,
+          com.baidu.hugegraph.util.DateUtil


update after https://github.com/hugegraph/hugegraph/pull/1289 merge

merged, rebase

zhoney · 2020-12-07T12:38:47Z

src/test/java/com/baidu/hugegraph/test/functional/AuthRestoreTest.java

+import com.baidu.hugegraph.testutil.Assert;
+import com.google.common.collect.Maps;
+
+public class AuthRestoreTest extends AuthTest{


add blank before "{"

zhoney · 2020-12-07T12:40:32Z

src/test/java/com/baidu/hugegraph/test/functional/AuthRestoreTest.java

+        for (Target target : targets) {
+             targetMap.put(target.name(), target);
+        }
+        Assert.assertTrue(targetMap.containsKey("test_target1"));


belong and access?

zhoney · 2020-12-07T12:42:35Z

src/test/java/com/baidu/hugegraph/test/functional/AuthRestoreTest.java

+    }
+
+    @Test
+    public void testAuthRestoreByStrategyConfict() {


zhoney · 2020-12-07T12:43:03Z

src/test/java/com/baidu/hugegraph/test/functional/AuthRestoreTest.java

+
+        Assert.assertThrows(RuntimeException.class, () -> {
+            HugeGraphCommand.main(args);
+        });


also assert exception message

zhoney · 2020-12-07T13:15:17Z

src/main/java/com/baidu/hugegraph/manager/AuthRestoreManager.java

+            int conflict = this.conflict_status;
+            User restoreUser = JsonUtil.fromJson(userStr, User.class);
+            if (userMap.containsKey(restoreUser.name())) {
+                User resourceUser = userMap.get(restoreUser.name());


zhoney · 2020-12-07T13:17:11Z

src/main/java/com/baidu/hugegraph/manager/AuthRestoreManager.java

+        }
+        for (String str : belongJsons) {
+            Belong restoreBelong = JsonUtil.fromJson(str, Belong.class);
+            if (checkIdMaps(restoreBelong.user().toString(),


improve checkIdMaps

zhoney · 2020-12-07T13:18:32Z

src/main/java/com/baidu/hugegraph/manager/AuthRestoreManager.java

+                       }, "Restore access of authority");
+             counts++;
+            }
+        Printer.print("Restore accesses finished, counts is %s !", counts);


zhoney · 2020-12-07T13:18:56Z

src/main/java/com/baidu/hugegraph/manager/AuthRestoreManager.java

+             restoreBelong.group(this.idsMap.get(restoreBelong.group().toString()));
+             retry(() -> {
+                       return this.client.authManager().createBelong(restoreBelong);
+                       }, "Restore targets of authority");


zhoney · 2020-12-07T13:23:37Z

src/main/java/com/baidu/hugegraph/manager/AuthRestoreManager.java

+        this.usersByName.put(restoreUser.name(), restoreUser);
+    }
+
+    private boolean checkIdMaps(String oneId, String otherId) {


checkAllExist

javeme · 2020-12-18T14:06:27Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

@@ -1043,8 +1043,8 @@ public GraphMode convert(String value) {
        public String convert(String value) {
            E.checkArgument(value != null && !value.isEmpty(),
                            "Strategy can't be null or empty");
-            E.checkArgument(AuthRestoreStrategy.STOP.string().equals(value) ||
-                            AuthRestoreStrategy.IGNORE.string().equals(value),
+            E.checkArgument(AuthRestoreConflictStrategy.STOP.string().equals(value) ||


exceed 80 chars, we can add AuthRestoreConflictStrategy.STOP.match(value) method

javeme · 2020-12-18T14:09:29Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

-                                    return client.authManager().createUser(restoreUser);
-                                    }, "Restore users of authority");
+                                 return client.authManager().createUser(restoreUser);
+                                 }, "Restore users of authority");


align with User

javeme · 2020-12-18T14:09:44Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

-                                      return client.authManager().createGroup(restoreGroup);
-                                      }, "Restore groups of authority");
+                                   return client.authManager().createGroup(restoreGroup);
+                                   }, "Restore groups of authority");


javeme · 2020-12-18T14:12:37Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

@@ -420,12 +424,16 @@ public void checkConflict() {
                    conflict++;
                }
                if (conflict > NO_CONFLICT) {
-                    E.checkArgument(strategy != AuthRestoreStrategy.STOP,
+                    E.checkArgument(strategy != AuthRestoreConflictStrategy.STOP,


don't check it since will return conflicts if strategy=STOP

javeme · 2020-12-18T14:12:55Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

-                                        return client.authManager().createTarget(restoreTarget);
-                                        }, "Restore targets of authority");
+                                     return client.authManager().createTarget(restoreTarget);
+                                     }, "Restore targets of authority");


javeme · 2020-12-18T14:14:00Z

src/test/java/com/baidu/hugegraph/test/util/FileUtil.java

@@ -53,7 +53,7 @@ public static boolean checkFileExists(String filePath) {
        return false;
    }

-    public static List<String> getFileDirectoryNames(String filePath) {
+    public static List<String> getFileSubdirectories(String filePath) {


just subdirectories() method is ok

javeme · 2020-12-18T14:15:53Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

                                    "Restore targets strategy is not found");
+                    if (strategy == AuthRestoreConflictStrategy.STOP) {
+                        conflicts.add(String.format("target name : %s",
+                                      restoreTarget.name()));


use conflicts.add(restoreTarget) and rewrite restoreTarget.toString

javeme · 2020-12-18T14:17:52Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

@@ -69,7 +70,7 @@
    private Map<String, Target> targetsByName;
    private Map<String, Belong> belongsByName;
    private Map<String, Access> accessesByName;
-    private List<AuthManager> authManagers;
+    private List<String> conflicts;


just let checkConflict() return List<String> conflicts

javeme · 2020-12-18T14:24:33Z

src/test/java/com/baidu/hugegraph/test/functional/AuthRestoreTest.java

+                "--init-password", "123456"
+        };
+
+        Assert.assertThrows(IllegalArgumentException.class, () -> {


don't throw IllegalArgumentException, prefer IllegalStateException

javeme · 2020-12-18T14:25:29Z

src/test/java/com/baidu/hugegraph/test/functional/AuthRestoreTest.java

+    }
+
+    @Test
+    public void testAuthRestoreWithStopStrategy() {


testAuthRestoreWithConflictAndStopStrategy

javeme · 2020-12-18T14:27:43Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+                try {
+                    hugeTypes.add(HugeType.valueOf(type.toUpperCase()));
+                } catch (IllegalArgumentException e) {
+                    throw new ParameterException(String.format(


replace ParameterException with IllegalArgumentException

javeme · 2020-12-18T14:30:03Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

+
+    private void doRestore() {
+        for (AuthManager authManager : this.authManagers) {
+            authManager.checkConflict();


javeme · 2020-12-18T14:32:47Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+            this.hdfsConf = hdfsConf;
+        }
+
+        public void retry(int retry) {


move to line 849

javeme · 2020-12-18T14:33:44Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+        public static final String strategy = "stop";
+
+        @Override
+        public String convert(String value) {


javeme · 2020-12-18T14:39:30Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+            this.hdfsConf = hdfsConf;
+        }
+
+        public void retry(int retry) {


move to line 849, put similar methods together

javeme · 2020-12-18T14:40:48Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+        public static final String strategy = "stop";
+
+        @Override
+        public String convert(String value) {


javeme · 2020-12-23T12:43:02Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+                            "Strategy can't be null or empty");
+            E.checkArgument(AuthRestoreConflictStrategy.matchStrategy(value),
+                            "Invalid --strategy '%s', valid value is" +
+                            " 'stop' or 'ignore", value);


put space to the previous line

javeme · 2020-12-23T12:43:50Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

+                User restoreUser = entry.getValue();
+                restoreUser.password(initPassword);
+                User user = retry(() -> {
+                return client.authManager().createUser(restoreUser);


add 4 spaces

javeme · 2020-12-23T12:44:13Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

+            for (Map.Entry<String, Target> entry : targetsByName.entrySet()) {
+                Target restoreTarget = entry.getValue();
+                Target target = retry(() -> {
+                return client.authManager().createTarget(restoreTarget);


javeme · 2020-12-23T12:45:15Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

+                                         "Querying belongs of authority");
+            Map<String, Belong>  belongMap = Maps.newHashMap();
+            for (Belong belong : belongs) {
+                 belongMap.put(belong.user() + ":" + belong.group(),


add local var key = belong.user() + ":" + belong.group()

javeme · 2020-12-23T12:45:31Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

+                restoreBelong.group(idsMap.get(restoreBelong.group().toString()));
+                retry(() -> {
+                     return client.authManager().createBelong(restoreBelong);
+                     }, "Restore belongs of authority");


align with retry

javeme · 2020-12-23T12:45:44Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

+                restoreAccess.group(idsMap.get(restoreAccess.group().toString()));
+                retry(() -> {
+                     return client.authManager().createAccess(restoreAccess);
+                     }, "Restore access of authority");


javeme · 2020-12-25T11:33:02Z

src/main/java/com/baidu/hugegraph/constant/AuthRestoreConflictStrategy.java

+        return false;
+    }
+
+    public static boolean matchStrategy(AuthRestoreConflictStrategy strategy) {


seems unused method

javeme · 2020-12-25T11:35:54Z

src/main/java/com/baidu/hugegraph/constant/AuthRestoreConflictStrategy.java

+        return false;
+    }
+
+    public static boolean matchStopStrategy(AuthRestoreConflictStrategy strategy) {


don't set static and change to isStopStrategy(), move to line 53
also add isIgnoreStrategy()

javeme · 2020-12-25T11:41:37Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+
+        @Parameter(names = {"--init-password"}, arity = 1,
+                   description = "Init user password, if restore type include " +
+                                 "'user', must init user password.")


please specify the init-password of users

javeme · 2020-12-25T11:44:29Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+        @Parameter(names = {"--strategy"},
+                   converter = AuthStrategyConverter.class,
+                   description = "The strategy needs to be chosen in the event " +
+                                 "of a conflict in restore. valid strategies include " +


in restore => when restoring

javeme · 2020-12-25T12:48:39Z

checkstyle.xml

+    <!--覆盖clone()方法时调用了super.clone()方法-->
+    <module name="SuperClone"/>
+  </module>
+</module>


add empty line

javeme · 2020-12-25T13:36:17Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

+                idsMap.put(restoreGroup.id().toString(), group.id().toString());
+                count++;
+            }
+            Printer.print("Restore groups finished, count is %d !", count);


"..., total count is %d"

javeme · 2021-01-04T03:56:23Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

+        public void backup() {
+            Printer.print("Belongs backup started...");
+            List<Belong> belongs = retry(client.authManager()::listBelongs,
+                                         "querying belongs of authority");


initial capitalization?

zhoney · 2021-01-04T11:16:13Z

src/test/java/com/baidu/hugegraph/test/util/FileUtil.java

+    }
+
+    public static List<String> readTestRestoreData(String filePath) {
+        List<String> resultList = Lists.newArrayList();


resultList => results

zhoney · 2021-01-04T11:16:52Z

src/test/java/com/baidu/hugegraph/test/util/FileUtil.java

+             baos.write(builder.toString().getBytes(API.CHARSET));
+             os.write(baos.toByteArray());
+        } catch (IOException e) {
+             throw new ToolsException("Failed writeText file path is %s",


Failed write file path is

zhoney · 2021-01-04T11:20:38Z

src/test/java/com/baidu/hugegraph/test/util/FileUtil.java

+        return list;
+    }
+
+    public static void clearFile(String filePath) {


seems function is clear directories

zhoney · 2021-01-04T11:43:33Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+        @Parameter(names = {"--strategy"},
+                   converter = AuthStrategyConverter.class,
+                   description = "The strategy needs to be chosen in the event " +
+                                 "of a conflict when restoring. valid " +


zhoney · 2021-01-04T11:45:21Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+                   listConverter = AuthHugeTypeConverter.class,
+                   description = "Type of auth data to restore and backup, concat with " +
+                                 "',' if more than one. 'all' means all auth information" +
+                                 " in other words, 'all' equals with 'user, group, target, " +


. In other words

zhoney · 2021-01-04T11:46:48Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+                                 "',' if more than one. 'all' means all auth information" +
+                                 " in other words, 'all' equals with 'user, group, target, " +
+                                 "belong, access'. in addition, only 'belong' or 'access' " +
+                                 "can not backup or restore, if type contains 'belong' " +


'belong' or 'access' can not backup or restore alone

zhoney · 2021-01-04T11:48:19Z

src/main/java/com/baidu/hugegraph/cmd/SubCommands.java

+    public static class AuthBackup extends AuthBackupRestore {
+
+        @ParametersDelegate
+        private AuthTypes types = new AuthTypes();


move types to AuthBackupRestore

zhoney · 2021-01-04T12:00:50Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

+             }
+        } catch (IOException e) {
+            throw new ToolsException("Failed to deserialize %s from %s",
+                                     e, resultList, type.string());


type.string(), resultList

zhoney · 2021-01-04T12:02:55Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

+        @Override
+        public List<String> checkConflict() {
+            List<Group> groups = retry(client.authManager()::listGroups,
+                                       "querying users of authority");


zhoney · 2021-01-04T12:06:01Z

src/main/java/com/baidu/hugegraph/manager/AuthBackupRestoreManager.java

+                restoreAccess.group(idsMap.get(restoreAccess.group().toString()));
+                retry(() -> {
+                     return client.authManager().createAccess(restoreAccess);
+                }, "restore access of authority");


javeme suggested changes Nov 30, 2020

View reviewed changes

xuliguov5 added 4 commits December 1, 2020 17:00

add auth backup and auth restore

373baa7

update some code format

b1f53bb

Add functional tests for auth backup and restore

5e42e78

update auth restore format

9c1f61b

xuliguov5 force-pushed the auth-backup-restore branch 4 times, most recently from d316753 to d8b1298 Compare December 1, 2020 11:58

add travis for tools

038980c

xuliguov5 force-pushed the auth-backup-restore branch from d8b1298 to 038980c Compare December 1, 2020 12:06

javeme suggested changes Dec 2, 2020

View reviewed changes

zhoney suggested changes Dec 2, 2020

View reviewed changes

update some format and some code optimization

cfc5f5a

xuliguov5 force-pushed the auth-backup-restore branch from d962f77 to cfc5f5a Compare December 3, 2020 03:08

zhoney suggested changes Dec 3, 2020

View reviewed changes

javeme suggested changes Dec 3, 2020

View reviewed changes

xuliguov5 force-pushed the auth-backup-restore branch 2 times, most recently from dc371f9 to 529b88e Compare December 4, 2020 14:16

update some format and code optimization

a984e85

xuliguov5 force-pushed the auth-backup-restore branch from 529b88e to a984e85 Compare December 4, 2020 14:20

zhoney suggested changes Dec 7, 2020

View reviewed changes

update code format

8bb22f7

zhoney suggested changes Dec 7, 2020

View reviewed changes

xuliguov5 force-pushed the auth-backup-restore branch 5 times, most recently from 3457b13 to 8abe8a9 Compare December 9, 2020 07:45

Update and optimize code format

7ae2624

Update and optimize some code

b84753b

xuliguov5 force-pushed the auth-backup-restore branch from 4ab761e to b84753b Compare December 18, 2020 12:37

javeme suggested changes Dec 18, 2020

View reviewed changes

javeme reviewed Dec 18, 2020

View reviewed changes

javeme suggested changes Dec 18, 2020

View reviewed changes

Update and optimized some code

65f03fa

xuliguov5 force-pushed the auth-backup-restore branch from 98ed387 to 65f03fa Compare December 21, 2020 03:12

javeme reviewed Dec 23, 2020

View reviewed changes

Update and optimize some code

d11a231

javeme suggested changes Dec 25, 2020

View reviewed changes

xuliguov5 added 2 commits December 25, 2020 20:27

Opdate and optimize some code

4b9e59d

add checkstyle for code

4c3d5c5

javeme reviewed Dec 25, 2020

View reviewed changes

javeme suggested changes Dec 25, 2020

View reviewed changes

Optimize some code

81aaed2

javeme reviewed Jan 4, 2021

View reviewed changes

Update retry description to lower case

57d3eb9

javeme previously approved these changes Jan 4, 2021

View reviewed changes

zhoney suggested changes Jan 4, 2021

View reviewed changes

Update and optimize some code

4079bd3

xuliguov5 dismissed javeme’s stale review via 4079bd3 January 4, 2021 12:46

javeme previously approved these changes Jan 5, 2021

View reviewed changes

Update the first code after the ‘.’ to uppercase

3589982

xuliguov5 dismissed javeme’s stale review via 3589982 January 5, 2021 04:13

javeme approved these changes Jan 5, 2021

View reviewed changes

zhoney approved these changes Jan 5, 2021

View reviewed changes

houzhizhen merged commit 12ec0d3 into master Jan 5, 2021

houzhizhen deleted the auth-backup-restore branch January 5, 2021 08:10

zhoney mentioned this pull request Jul 2, 2021

add CI tests #24

Closed


		public final class ToolUtil {

		public static void shutdown(List<ToolManager> taskManager) {

add auth backup and auth restore #76

add auth backup and auth restore #76

Conversation

xuliguov5 commented Nov 30, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment