Add multi-node auth information sharing function #1350

xuliguov5 · 2021-01-29T07:52:10Z

No description provided.

javeme · 2021-01-29T11:26:05Z

hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java

@@ -101,7 +101,7 @@

    private final HugeGraph hugegraph;
    private final TaskScheduler taskScheduler;
-    private final UserManager userManager;
+    private UserManager userManager;


javeme · 2021-01-29T11:26:39Z

hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java

@@ -652,6 +652,12 @@ public UserManager userManager() {
        return this.userManager;
    }

+    @Override
+    public void swichUserManager(UserManager userManager) {
+        verifyAdminPermission();


this.verifyAdminPermission()

javeme · 2021-01-29T11:27:46Z

hugegraph-api/src/main/java/com/baidu/hugegraph/auth/StandardAuthenticator.java

+
+        String remoteUrl = config.get(ServerOptions.AUTH_REMOTE_URL);
+        if (StringUtils.isNotEmpty(remoteUrl)) {
+            this.graph.swichUserManager(new RpcClientProvider(config).


define RpcClientProvider provider first

javeme · 2021-01-29T11:29:46Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+
+    public static final ConfigOption<Integer> RPC_SERVER_PORT =
+            new ConfigOption<>(
+                    "rpc.server.port",


rpcserver.port, same as other options

javeme · 2021-01-29T11:30:21Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+    public static final ConfigOption<Integer> RPC_SERVER_TIMEOUT =
+            new ConfigOption<>(
+                    "rpc.server.timeout",
+                    "Rpc server connction timeout",


javeme · 2021-01-29T11:49:40Z

hugegraph-api/src/main/java/com/baidu/hugegraph/sofarpc/RpcConsumerConfig.java

+
+public class RpcConsumerConfig {
+
+    private final Map<String, ConsumerConfig> CONSUMER_CONFIG =


rename config

javeme · 2021-01-29T11:51:17Z

hugegraph-api/src/main/java/com/baidu/hugegraph/sofarpc/SofaRpcClient.java

+        private final static SofaRpcClient INSTANCE = new SofaRpcClient();
+    }
+
+    public static SofaRpcClient getInstance() {


rename to instance(), because our style is no "get" prefix

javeme · 2021-01-29T11:54:52Z

hugegraph-api/src/main/java/com/baidu/hugegraph/sofarpc/SofaRpcClient.java

+    }
+
+    public static SofaRpcClient getInstance() {
+        return SofaRpcClientHolder.INSTANCE;


do we need to create one instance for each connection?

javeme · 2021-01-29T11:56:10Z

hugegraph-api/src/main/java/com/baidu/hugegraph/sofarpc/SofaRpcServer.java

+        RpcConfigs.putValue("logger.impl",
+                            conf.get(ServerOptions.RPC_LOGGER_IMPL));
+        this.serverConfig = new ServerConfig()
+                .setProtocol(conf.get(ServerOptions.RPC_PROTOCOL))


align with new ServerConfig

javeme · 2021-01-29T11:56:53Z

hugegraph-api/src/main/java/com/baidu/hugegraph/sofarpc/SofaRpcServer.java

+        }
+    }
+
+    public int getBindPort() {


javeme · 2021-02-01T06:53:34Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

            new ConfigOption<>(
-                    "rpc.server.timeout",
-                    "Rpc server connction timeout",
+                    "rpc.connection_timeout",


rpcclient or rpc.client_connection_timeout

javeme · 2021-02-01T06:54:40Z

hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java

        this.rpcServerProvider.destroy();
    }

+    public void close() {


move to line 164

javeme · 2021-02-01T06:56:54Z

hugegraph-api/src/main/java/com/baidu/hugegraph/sofarpc/RpcConsumerConfig.java

@@ -30,7 +30,7 @@

 public class RpcConsumerConfig {

-    private final Map<String, ConsumerConfig> CONSUMER_CONFIG =
+    private final Map<String, ConsumerConfig> CONFIG =


rename to config, only const var(static final) use capital letters

javeme · 2021-02-01T07:04:34Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+
+    public static final ConfigOption<Integer> RPC_SERVER_PORT =
+            new ConfigOption<>(
+                    "rpcserver.port",


rpc.server_port

javeme · 2021-02-01T07:06:04Z

hugegraph-api/src/main/java/com/baidu/hugegraph/sofarpc/SofaRpcServer.java

+        RpcConfigs.putValue("logger.impl",
+                            conf.get(ServerOptions.RPC_LOGGER_IMPL));
+        this.serverConfig = new ServerConfig()
+                            .setProtocol(conf.get(ServerOptions.RPC_PROTOCOL))


RPC_SERVER_PROTOCOL

javeme · 2021-02-01T07:07:57Z

hugegraph-api/src/main/java/com/baidu/hugegraph/sofarpc/RpcConsumerConfig.java

+    public ConsumerConfig consumerConfig(String serverName) {
+        if (!CONFIG.containsKey(serverName)) {
+            throw new SofaRpcException(RpcErrorType.CLIENT_UNDECLARED_ERROR,
+                                       String.format("Invalid server name " +


define var error

javeme · 2021-02-01T07:09:39Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+                    "rpc.config.order",
+                    "Sofa rpc loading order, the larger the more after " +
+                     "loading",
+                    rangeInt(-1, Integer.MAX_VALUE),


check the range

javeme · 2021-02-01T07:09:52Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+    public static final ConfigOption<Integer> RPC_RETRIES =
+            new ConfigOption<>(
+                    "rpc.retries",
+                    "Rpc server failed and retries times",


javeme · 2021-02-01T07:09:57Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+            new ConfigOption<>(
+                    "rpc.retries",
+                    "Rpc server failed and retries times",
+                    rangeInt(-1, Integer.MAX_VALUE),


check the range

javeme · 2021-02-01T08:55:16Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

@@ -225,76 +225,80 @@ public static synchronized ServerOptions instance() {
    public static final ConfigOption<String> AUTH_REMOTE_URL =
            new ConfigOption<>(
                    "auth.remote_url",
-                    "Auth server address",
+                    "Auth server address. If the address is empty, it is " +
+                    "only auth Service, otherwise it is auth server and auth " +


If the address is empty, it provide auth service, otherwise it is auth client and also provide auth service through rpc forwarding.

javeme · 2021-02-01T08:55:38Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

-                    "Rpc server port",
-                    rangeInt(-1, Integer.MAX_VALUE),
+                    "rpc.server_port",
+                    "The port of rpc server for rpc client call.",


javeme · 2021-02-01T08:56:39Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

-                    "Rpc connection timeout",
-                    rangeInt(-1, Integer.MAX_VALUE),
+                    "rpc.client_connection_timeout",
+                    "The rpc client connect rpc server timeout(seconds).",


The timeout(in seconds) of rpc client connect to rpc server

javeme · 2021-02-01T08:56:51Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

-                    "Rpc read timeout",
-                    rangeInt(-1, Integer.MAX_VALUE),
+                    "rpc.client_read_timeout",
+                    "The rpc client read from rpc server timeout(seconds).",


javeme · 2021-02-01T08:58:00Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

                    3
            );

+    public static final ConfigOption<String> RPC_PROTOCOL =


should we rename to RPC_SERVER_PROTOCOL?
and move to place of server options

javeme · 2021-02-01T09:00:10Z

hugegraph-api/src/main/java/com/baidu/hugegraph/sofarpc/RpcServerProvider.java

@@ -42,6 +44,13 @@ public RpcServerProvider(HugeConfig conf, UserManager userManager) {
                 this.rpcServer.port());
    }

+    private void initRpcConfigs(HugeConfig conf) {


how client call this method

javeme · 2021-02-02T08:48:10Z

hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java

+
+    private void startRpcServer(HugeConfig conf) {
+        if (this.authenticator != null) {
+            this.rpcServerProvider = new RpcServerProvider(conf,


set rpcServerProvider final and return RpcServerProvider here

javeme · 2021-02-02T08:49:41Z

hugegraph-api/src/main/java/com/baidu/hugegraph/sofarpc/RpcServerProvider.java

+                new RpcProviderConfig(UserManager.class, userManager);
+        this.rpcServer = new SofaRpcServer(conf, rpcProviderConfig);
+        this.rpcServer.exportAll();
+        LOG.info("rpcServer start success, bind port is {}",


javeme · 2021-02-02T08:50:41Z

hugegraph-api/src/main/java/com/baidu/hugegraph/sofarpc/exception/RpcException.java

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


unneeded exception package

javeme · 2021-02-02T08:52:08Z

hugegraph-api/src/main/java/com/baidu/hugegraph/sofarpc/RpcClientProvider.java

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


rename package sofarpc to rpc

javeme · 2021-02-02T11:15:41Z

hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java

@@ -77,7 +77,7 @@ public GraphManager(HugeConfig conf) {
        // Raft will load snapshot firstly then launch election and replay log
        this.waitGraphsStarted();
        this.checkBackendVersionOrExit();
-        this.startRpcServer(conf);
+        this.rpcServerProvider = startRpcServer(conf);


this.startRpcServer()

javeme · 2021-02-02T11:24:02Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcServerProvider.java

@@ -33,13 +33,13 @@
    private final SofaRpcServer rpcServer;

    public RpcServerProvider(HugeConfig conf, UserManager userManager) {
-        LOG.info("rpcServer start {}", conf.get(ServerOptions.RPC_SERVER_PORT));
+        LOG.info("RpcServer start {}", conf.get(ServerOptions.RPC_SERVER_PORT));


"RpcServer starting on port {}"
LOG.debug() is ok

javeme · 2021-02-02T11:24:23Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcServerProvider.java

        RpcCommonConfig.initRpcConfigs(conf);
        RpcProviderConfig rpcProviderConfig =
                new RpcProviderConfig(UserManager.class, userManager);
        this.rpcServer = new SofaRpcServer(conf, rpcProviderConfig);
        this.rpcServer.exportAll();
-        LOG.info("rpcServer start success, bind port is {}",
+        LOG.info("RpcServer start success, bind port is {}",


RpcServer started success on port {}

javeme · 2021-02-02T11:25:14Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+                    "rpc.protocol",
+                    "Rpc communication protocol, client and server need to " +
+                    "be specified at the same time, and can match.",
+                    disallowEmpty(),


allowedValues()

javeme · 2021-02-02T11:27:17Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcConsumerConfig.java

+public class RpcConsumerConfig {
+
+    private final Map<String, ConsumerConfig> config =
+            Maps.newHashMap();


align with config

javeme · 2021-02-02T11:29:04Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcProviderConfig.java

+
+public class RpcProviderConfig {
+
+    private final Map<String, ProviderConfig> PROVIDER_CONFIG =


javeme · 2021-02-02T11:29:10Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcProviderConfig.java

+        this.buildProviderConfig(clazz, serviceImpl);
+    }
+
+    public <T, E extends T> void buildProviderConfig(Class<T> clazz,


javeme · 2021-02-02T11:34:12Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcProviderConfig.java

+        PROVIDER_CONFIG.put(clazz.getName(), providerConfig);
+    }
+
+    public Map<String, ProviderConfig> providerConfigMap() {


providerConfigs()

javeme · 2021-02-02T11:35:27Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcProviderConfig.java

+    private final Map<String, ProviderConfig> PROVIDER_CONFIG =
+            Maps.newHashMap();
+
+    public <T, E extends T> RpcProviderConfig(Class<T> clazz,


delete this constructor

javeme · 2021-02-02T11:35:36Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcConsumerConfig.java

+    private final Map<String, ConsumerConfig> config =
+            Maps.newHashMap();
+
+    public <T> RpcConsumerConfig(Class<T> clazz, HugeConfig conf) {


delete this constructor

javeme · 2021-02-02T12:36:14Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcServerProvider.java

        this.rpcServer = new SofaRpcServer(conf, rpcProviderConfig);
        this.rpcServer.exportAll();
-        LOG.info("RpcServer start success, bind port is {}",
-                 this.rpcServer.port());
+        LOG.debug("RpcServer started success on port {}",


hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcException.java

javeme · 2021-02-03T03:27:19Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcServerProvider.java

@@ -33,15 +33,15 @@
    private final SofaRpcServer rpcServer;

    public RpcServerProvider(HugeConfig conf, UserManager userManager) {
-        LOG.debug("RpcServer starting on port {}",
-                  conf.get(ServerOptions.RPC_SERVER_PORT));
+        LOG.info("RpcServer starting on port {}",


keep LOG.debug here

javeme · 2021-02-03T03:27:39Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcServerProvider.java

        RpcCommonConfig.initRpcConfigs(conf);
        RpcProviderConfig rpcProviderConfig = new RpcProviderConfig();
        rpcProviderConfig.addProviderConfig(UserManager.class, userManager);
        this.rpcServer = new SofaRpcServer(conf, rpcProviderConfig);
        this.rpcServer.exportAll();
-        LOG.debug("RpcServer started success on port {}",
-                  this.rpcServer.port());
+        LOG.info("RpcServer started success on port {}",


keep LOG.info here

javeme · 2021-02-03T03:28:29Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

@@ -222,6 +222,85 @@ public static synchronized ServerOptions instance() {
                    "hugegraph:9fd95c9c-711b-415b-b85f-d4df46ba5c31"
            );

+    public static final ConfigOption<String> AUTH_REMOTE_URL =
+            new ConfigOption<>(


define as ListConfigOption for multi auth servers

javeme · 2021-02-03T03:29:33Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/SofaRpcServer.java

+
+public class SofaRpcServer {
+
+    private Map<String, ProviderConfig> providerConfigMap;


providerConfigs

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/SofaRpcServer.java

javeme · 2021-02-03T03:36:24Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+    public static final ConfigOption<Integer> RPC_SERVER_PORT =
+            new ConfigOption<>(
+                    "rpc.server_port",
+                    "The port of rpc server for rpc client calling.",


The port bound by rpc server to provide services

javeme · 2021-02-03T03:39:23Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+    public static final ConfigOption<String> RPC_SERVER_HOST =
+            new ConfigOption<>(
+                    "rpc.server_host",
+                    "The specified host of rpc server for rpc client " +


The host/ip bound by rpc server to provide services

javeme · 2021-02-03T03:40:33Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+            new ConfigOption<>(
+                    "rpc.config_order",
+                    "Sofa rpc loading order, the larger the more after." +
+                     "loading",


move to previous line

javeme · 2021-02-03T03:41:47Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+    public static final ConfigOption<Integer> RPC_CONFIG_ORDER =
+            new ConfigOption<>(
+                    "rpc.config_order",
+                    "Sofa rpc loading order, the larger the more after." +


seems "loading" is behind "."

javeme · 2021-02-03T13:09:27Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+                    "rpc.client_load_balancer",
+                    "The rpc client uses a load-balancing algorithm to " +
+                    "configure the addresses of multiple rpc servers. Default " +
+                    "value is 'consistentHash', means forwording by parameters.",


by request parameters

javeme · 2021-02-03T13:11:28Z

hugegraph-dist/src/assembly/static/conf/rest-server.properties

 rpc.server_port=8899
-rpc.server_host=172.24.174.30
+rpc.server_host=172.24.174.28


keep 127.0.0.1

javeme · 2021-02-03T13:18:57Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

-                    "The specified host of rpc server for rpc client " +
-                    "call.",
+                    "The multiple hosts/ips bound by rpc server to provide " +
+                    "services. Multiple hosts/ips link them with ',' together.",


multiple host -- seems describe AUTH_REMOTE_URL

zhoney · 2021-02-04T09:01:38Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/SofaRpcServer.java

+
+    public void unExport(String serviceName) {
+        if (!this.providerConfigs.containsKey(serviceName)) {
+            throw new RpcException("Service name '%s' is not exist, please " +


The service name '%s' doesn't exist

zhoney · 2021-02-04T09:02:04Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcProviderConfig.java

+    }
+
+    public Map<String, ProviderConfig> providerConfigs() {
+        return configs;


this.configs

zhoney · 2021-02-04T09:02:27Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/SofaRpcServer.java

+
+    public void exportAll() {
+        if (MapUtils.isEmpty(this.providerConfigs)) {
+            throw new RpcException("Server provider config map is empty");


The server provider config map can't be empty

zhoney · 2021-02-04T09:03:04Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcConsumerConfig.java

+                .setRetries(conf.get(ServerOptions.RPC_CLIENT_RETRIES))
+                .setLoadBalancer(conf.get(
+                                 ServerOptions.RPC_CLIENT_LOAD_BALANCER));
+        configs.put(clazz.getName(), consumerConfig);


this.configs

zhoney · 2021-02-04T09:03:10Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcConsumerConfig.java

+        if (!configs.containsKey(serverName)) {
+            throw new RpcException("Invalid server name '%s'", serverName);
+        }
+        return configs.get(serverName);


javeme · 2021-02-08T08:11:26Z

hugegraph-api/src/main/java/com/baidu/hugegraph/api/metrics/MetricsAPI.java

@@ -76,7 +76,7 @@ public String system() {
    @Timed
    @Path("backend")
    @Produces(APPLICATION_JSON_WITH_CHARSET)
-    @RolesAllowed({"admin", "$owner= $action=metrics_read"})
+//    @RolesAllowed({"admin", "$owner= $action=metrics_read"})


keep the origin

javeme · 2021-02-08T08:13:09Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+                    "auth.remote_url",
+                    "If the address is empty, it provide auth service, " +
+                    "otherwise it is auth client and also provide auth service " +
+                    "through rpc forwarding. The remote url can set multiple " +


The remote url can be set to multiple addresses

javeme · 2021-02-08T08:14:36Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+            new ConfigOption<>(
+                    "rpc.client_load_balancer",
+                    "The rpc client uses a load-balancing algorithm to " +
+                    "configure the addresses of multiple rpc servers. Default " +


to access multiple rpc servers in one cluster

javeme · 2021-02-08T08:17:00Z

hugegraph-api/src/main/java/com/baidu/hugegraph/core/GraphManager.java

+    }
+
+    private void destoryRpcServer() {
+        this.rpcServerProvider.destroy();


call if rpcServerProvider != null

javeme · 2021-02-08T08:19:20Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/SofaRpcServer.java

+
+    public void exportAll() {
+        if (MapUtils.isEmpty(this.providerConfigs)) {
+            throw new RpcException("The server provider config map can't be " +


wrap line after "(" and align with RpcException

javeme · 2021-02-08T08:26:40Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+                    "bolt"
+            );
+
+    public static final ConfigOption<Integer> RPC_CONFIG_ORDER =


is the option required

If this option is not set, the sofa-rpc log may be lost.

javeme · 2021-02-08T12:42:04Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+
+    public static final ConfigOption<Integer> RPC_CLIENT_CONNECTION_TIMEOUT =
+            new ConfigOption<>(
+                    "rpc.client_connection_timeout",


rename to client_connect_timeout
and add client_reconnect_timeout

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

javeme · 2021-02-08T12:56:24Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+                    "The timeout(in seconds) of rpc client read from rpc " +
+                    "server.",
+                    rangeInt(1, Integer.MAX_VALUE),
+                    8000


javeme · 2021-02-08T12:56:33Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+                    "The timeout(in seconds) of rpc client connect to rpc " +
+                    "server.",
+                    rangeInt(1, Integer.MAX_VALUE),
+                    8000


javeme · 2021-02-09T03:16:34Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcConsumerConfig.java

@@ -35,9 +35,11 @@
                .setInterfaceId(clazz.getName())
                .setProtocol(conf.get(ServerOptions.RPC_PROTOCOL))
                .setDirectUrl(conf.get(ServerOptions.AUTH_REMOTE_URL))
-                .setTimeout(conf.get(ServerOptions.RPC_CLIENT_READ_TIMEOUT))
+                .setTimeout(conf.get(ServerOptions.CLIENT_READ_TIMEOUT)*1000)


javeme · 2021-02-09T03:16:38Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcConsumerConfig.java

                .setConnectTimeout(conf.get(
-                                   ServerOptions.RPC_CLIENT_CONNECTION_TIMEOUT))
+                                   ServerOptions.CLIENT_CONNECTION_TIMEOUT)*1000)


javeme · 2021-02-09T03:16:43Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcConsumerConfig.java

-                                   ServerOptions.RPC_CLIENT_CONNECTION_TIMEOUT))
+                                   ServerOptions.CLIENT_CONNECTION_TIMEOUT)*1000)
+                .setReconnectPeriod(conf.get(
+                                    ServerOptions.CLIENT_RECONNECTION_TIMEOUT) *1000)


javeme · 2021-02-09T03:18:17Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+
+    public static final ConfigOption<Integer> CLIENT_RECONNECTION_TIMEOUT =
+            new ConfigOption<>(
+                    "rpc.client_reconnection_timeout",


client_connect_timeout and client_reconnect_timeout, not connection

javeme · 2021-02-09T03:19:53Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/SofaRpcServer.java

@@ -35,6 +35,7 @@

    private Map<String, ProviderConfig> providerConfigs;
    private ServerConfig serverConfig;
+    private final int rpcServerTimeout;


also set final for serverConfig and providerConfigs

javeme · 2021-02-09T03:20:34Z

hugegraph-dist/src/assembly/static/conf/rest-server.properties

-rpc.client_read_timeout=8000
+rpc.server_timeout=30
+rpc.client_connection_timeout=20
+rpc.client_reconnection_timeout=20


…timize some code.

javeme · 2021-02-09T07:33:40Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/RpcConsumerConfig.java

+        int connectTimeout = conf.get(ServerOptions
+                                      .CLIENT_CONNECT_TIMEOUT) * 1000;
+        int reconnectPeriod = conf.get(ServerOptions
+                                       .CLIENT_RECONNECT_TIMEOUT) * 1000;


rename to CLIENT_RECONNECT_PERIOD

javeme · 2021-02-09T07:34:02Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

@@ -258,18 +258,18 @@ public static synchronized ServerOptions instance() {
                    30
            );

-    public static final ConfigOption<Integer> CLIENT_CONNECTION_TIMEOUT =
+    public static final ConfigOption<Integer> CLIENT_CONNECT_TIMEOUT =


add RPC prefix: RPC_CLIENT_CONNECT_TIMEOUT

codecov · 2021-02-09T07:52:14Z

Codecov Report

Merging #1350 (e2a3bad) into master (c3f81f5) will decrease coverage by 0.10%.
The diff coverage is 40.38%.

@@             Coverage Diff              @@
##             master    #1350      +/-   ##
============================================
- Coverage     62.49%   62.39%   -0.11%     
- Complexity     5816     5818       +2     
============================================
  Files           379      385       +6     
  Lines         31766    31922     +156     
  Branches       4443     4451       +8     
============================================
+ Hits          19853    19917      +64     
- Misses         9895     9984      +89     
- Partials       2018     2021       +3

Impacted Files	Coverage Δ	Complexity Δ
...a/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java	`3.98% <0.00%> (-0.05%)`	`0.00 <0.00> (ø)`
...om/baidu/hugegraph/auth/StandardAuthenticator.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (ø)`
...ava/com/baidu/hugegraph/rpc/RpcClientProvider.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...ava/com/baidu/hugegraph/rpc/RpcConsumerConfig.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...ain/java/com/baidu/hugegraph/rpc/RpcException.java	`0.00% <0.00%> (ø)`	`0.00 <0.00> (?)`
...e/src/main/java/com/baidu/hugegraph/HugeGraph.java	`65.30% <ø> (ø)`	`9.00 <0.00> (ø)`
...in/java/com/baidu/hugegraph/StandardHugeGraph.java	`78.21% <0.00%> (-0.13%)`	`120.00 <0.00> (+1.00)`	⬇️
...c/main/java/com/baidu/hugegraph/auth/HugeUser.java	`88.67% <ø> (ø)`	`32.00 <0.00> (ø)`
...in/java/com/baidu/hugegraph/auth/SchemaDefine.java	`69.91% <ø> (ø)`	`10.00 <0.00> (ø)`
.../com/baidu/hugegraph/server/ApplicationConfig.java	`93.47% <25.00%> (-6.53%)`	`0.00 <0.00> (ø)`
... and 12 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update c3f81f5...e2a3bad. Read the comment docs.

zhoney · 2021-02-09T07:52:24Z

hugegraph-dist/src/assembly/static/conf/rest-server.properties

@@ -13,3 +13,14 @@ graphs=[hugegraph:conf/hugegraph.properties]

 server.id=server-1
 server.role=master
+
+#auth.remote_url=10.103.168.25:8899,10.103.168.25:8898,10.103.168.25:8897


use 127.0.0.1 instead of test machine ip

zhoney · 2021-02-09T07:53:12Z

hugegraph-dist/src/assembly/static/conf/rest-server.properties

+
+#auth.remote_url=10.103.168.25:8899,10.103.168.25:8898,10.103.168.25:8897
+rpc.server_port=8899
+rpc.server_host=127.0.0.1


move server_host before server_host

zhoney · 2021-02-09T07:55:27Z

hugegraph-api/src/main/java/com/baidu/hugegraph/server/ApplicationConfig.java

                @Override
                public void onEvent(ApplicationEvent event) {
                    if (event.getType() == this.EVENT_INITED) {
                        manager = new GraphManager(conf);
+                    } else if(event.getType() == this.EVENT_DESTROY) {


add a space after "if"

zhoney · 2021-02-09T08:09:46Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+                    20
+            );
+
+    public static final ConfigOption<Integer> CLIENT_RECONNECT_PERIOD =


prefer adding "RPC_" prefix also

zhoney · 2021-02-09T08:09:52Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+                    20
+            );
+
+    public static final ConfigOption<Integer> CLIENT_READ_TIMEOUT =


zhoney · 2021-02-09T08:11:39Z

hugegraph-api/src/main/java/com/baidu/hugegraph/api/metrics/MetricsAPI.java

@@ -76,7 +76,7 @@ public String system() {
    @Timed
    @Path("backend")
    @Produces(APPLICATION_JSON_WITH_CHARSET)
-    @RolesAllowed({"admin", "$owner= $action=metrics_read"})
+//  @RolesAllowed({"admin", "$owner= $action=metrics_read"})


is this comment expected?

javeme · 2021-02-10T03:01:37Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

@@ -267,7 +267,7 @@ public static synchronized ServerOptions instance() {
                    20
            );

-    public static final ConfigOption<Integer> CLIENT_RECONNECT_PERIOD =
+    public static final ConfigOption<Integer> RPC_CLIENT_RECONNECT_PERIOD =


also update rpc.client_reconnect_timeout

javeme · 2021-02-10T03:05:24Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+            new ConfigOption<>(
+                    "rpc.protocol",
+                    "Rpc communication protocol, client and server need to " +
+                    "be specified at the same time, and can match.",


client and server need to be specified the same value

javeme · 2021-02-10T03:05:42Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+            new ConfigOption<>(
+                    "rpc.config_order",
+                    "Sofa rpc configuration file loading order, the larger " +
+                    "the more later loading",


javeme · 2021-02-10T03:06:19Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+    public static final ConfigOption<Integer> RPC_CLIENT_RETRIES =
+            new ConfigOption<>(
+                    "rpc.client_retries",
+                    "Failed retry number of rpc client calls to rpc Server.",


Server => server -- to keep the same style with other options

javeme · 2021-02-10T03:07:57Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+            new ConfigOption<>(
+                    "rpc.client_retries",
+                    "Failed retry number of rpc client calls to rpc Server.",
+                    rangeInt(1, Integer.MAX_VALUE),


can the min value be 0?

javeme · 2021-02-10T03:09:29Z

hugegraph-core/src/main/resources/log4j2.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>


remove this file

javeme · 2021-02-10T03:34:50Z

ci error:

local log of init-store:

javeme · 2021-02-10T06:06:59Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

@@ -309,7 +309,7 @@ public static synchronized ServerOptions instance() {
            new ConfigOption<>(
                    "rpc.protocol",
                    "Rpc communication protocol, client and server need to " +
-                    "be specified at the same time, and can match.",
+                    "be specified the same value, and can match.",


remove " and can match"

javeme · 2021-02-10T06:08:30Z

hugegraph-api/src/main/java/com/baidu/hugegraph/config/ServerOptions.java

+                    "The hosts/ips bound by rpc server to provide " +
+                    "services.",
+                    disallowEmpty(),
+                    "0.0.0.0"


set default value 127.0.0.1

javeme · 2021-02-10T06:12:08Z

hugegraph-dist/src/assembly/static/conf/rest-server.properties

@@ -13,3 +13,14 @@ graphs=[hugegraph:conf/hugegraph.properties]

 server.id=server-1
 server.role=master
+
+#auth.remote_url=127.0.0.1:8899,127.0.0.1:8898,127.0.0.1:8897


move to line 13

houzhizhen · 2021-02-10T06:43:10Z

hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java

@@ -652,6 +652,12 @@ public UserManager userManager() {
        return this.userManager;
    }

+    @Override
+    public void swichUserManager(UserManager userManager) {


switch -> switch

houzhizhen · 2021-02-10T06:44:19Z

hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java

+    @Override
+    public void swichUserManager(UserManager userManager) {
+        this.verifyAdminPermission();
+        this.userManager.swichUserManager(userManager);


swich -> switch

houzhizhen · 2021-02-10T06:46:21Z

hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java

@@ -1345,6 +1351,11 @@ public RolePermission loginUser(String username, String password) {
                setContext(context);
            }
        }
+
+        private void swichUserManager(UserManager userManager) {


swich -> switch

houzhizhen · 2021-02-10T06:47:14Z

hugegraph-api/src/main/java/com/baidu/hugegraph/auth/HugeGraphAuthProxy.java

+
+        private void swichUserManager(UserManager userManager) {
+            this.userManager = userManager;
+            hugegraph.swichUserManager(userManager);


houzhizhen · 2021-02-10T07:05:28Z

hugegraph-core/src/main/java/com/baidu/hugegraph/HugeGraph.java

@@ -155,6 +155,7 @@
    public HugeFeatures features();

    public UserManager userManager();
+    public void swichUserManager(UserManager userManager);


swich -> switch

houzhizhen · 2021-02-10T07:05:47Z

hugegraph-core/src/main/java/com/baidu/hugegraph/StandardHugeGraph.java

@@ -883,6 +883,11 @@ public UserManager userManager() {
        return this.userManager;
    }

+    @Override
+    public void swichUserManager(UserManager userManager) {


swich -> switch

javeme · 2021-02-10T07:55:42Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/SofaRpcServer.java

+        Map<String, ProviderConfig> configs = this.configs.configs();
+        if (!configs.containsKey(serviceName)) {
+            throw new RpcException("The service name '%s' doesn't exist, " +
+                                   "please change others", serviceName);


remove "please change others"

javeme · 2021-02-10T07:57:05Z

hugegraph-api/src/main/java/com/baidu/hugegraph/rpc/SofaRpcServer.java

+        LOG.debug("RpcServer starting on port {}", this.port());
+        Map<String, ProviderConfig> configs = this.configs.configs();
+        if (MapUtils.isEmpty(configs)) {
+            LOG.info("RpcServer configs is empty, skip RpcServer starting");


RpcServer config is empty

javeme requested changes Jan 29, 2021

View reviewed changes

javeme requested changes Feb 1, 2021

View reviewed changes

javeme reviewed Feb 1, 2021

View reviewed changes

javeme requested changes Feb 2, 2021

View reviewed changes

javeme requested changes Feb 3, 2021

View reviewed changes

javeme reviewed Feb 3, 2021

View reviewed changes

zhoney requested changes Feb 4, 2021

View reviewed changes

xuliguov5 force-pushed the share_auth_information branch from ea74775 to b6664c5 Compare February 8, 2021 01:19

javeme requested changes Feb 8, 2021

View reviewed changes

xuliguov5 force-pushed the share_auth_information branch from 2ed6974 to 3335585 Compare February 8, 2021 13:32

xuliguov5 added 13 commits February 9, 2021 09:42

Add multi-node auth information sharing function

d6a32da

Optimize and update some code

a4d7b2e

Optimize and update some code

b43b699

Optimize and update some code

431f5bc

Optimize and update some code

2836392

Optimize and update some code

bba8e75

Optimize and update some code

f2cc09c

Optimize and update some code

2b953b9

Optimize and update some code

b10030b

Optimize and update some code

7fdbbd5

Optimize and update some code

c354121

Optimize and update some code

c1dc32b

Optimize and update some code

eec6ae2

xuliguov5 force-pushed the share_auth_information branch from 3335585 to eec6ae2 Compare February 9, 2021 01:44

javeme reviewed Feb 9, 2021

View reviewed changes

Exclude sofa rpc and other projects with the same jar package, and Op…

14a7e6d

…timize some code.

javeme reviewed Feb 9, 2021

View reviewed changes

Optimize and update some code

3c78da1

zhoney requested changes Feb 9, 2021

View reviewed changes

Optimize and update some code

ce81669

zhoney previously approved these changes Feb 9, 2021

View reviewed changes

javeme requested changes Feb 10, 2021

View reviewed changes

xuliguov5 dismissed zhoney’s stale review via 90e6d1b February 10, 2021 03:53

Optimize and update some code

fd508d6

xuliguov5 force-pushed the share_auth_information branch from 90e6d1b to fd508d6 Compare February 10, 2021 03:55

javeme reviewed Feb 10, 2021

View reviewed changes

Optimize and update some code

b1660b7

houzhizhen reviewed Feb 10, 2021

View reviewed changes

Optimize and update some code

d2747a6

javeme reviewed Feb 10, 2021

View reviewed changes

Optimize and update some code

e2a3bad

houzhizhen approved these changes Feb 10, 2021

View reviewed changes

javeme approved these changes Feb 10, 2021

View reviewed changes

javeme merged commit 7f63b57 into master Feb 10, 2021

javeme deleted the share_auth_information branch February 10, 2021 09:20


		public class RpcConsumerConfig {

		private final Map<String, ConsumerConfig> CONSUMER_CONFIG =


		public class RpcProviderConfig {

		private final Map<String, ProviderConfig> PROVIDER_CONFIG =


		public class SofaRpcServer {

		private Map<String, ProviderConfig> providerConfigMap;

Add multi-node auth information sharing function #1350

Add multi-node auth information sharing function #1350

Conversation

xuliguov5 commented Jan 29, 2021

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