chore:redirect CUD task to master

apache · Feb 28, 2023 · fab5a17 · fab5a17
1 parent ac55871
commit fab5a17
Show file tree

Hide file tree

Showing 29 changed files with 348 additions and 7 deletions.
diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/RedirectFilter.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/filter/RedirectFilter.java
@@ -0,0 +1,76 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hugegraph.api.filter;
+
+import java.io.IOException;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+import jakarta.ws.rs.NameBinding;
+import jakarta.ws.rs.container.ContainerRequestContext;
+import jakarta.ws.rs.container.ContainerRequestFilter;
+import jakarta.ws.rs.core.Response;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.utils.URIBuilder;
+import org.apache.hugegraph.election.GlobalMasterInfo;
+import org.apache.hugegraph.util.Log;
+import org.slf4j.Logger;
+
+public class RedirectFilter implements ContainerRequestFilter {
+
+    private static final Logger LOG = Log.logger(RedirectFilter.class);
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        GlobalMasterInfo instance = GlobalMasterInfo.instance();
+        if (!instance.isFeatureSupport()) {
+            return;
+        }
+
+        String url = "";
+        synchronized (instance) {
+            if (instance.isMaster() || StringUtils.isEmpty(instance.url())) {
+                return;
+            }
+            url = instance.url();
+        }
+
+        URI redirectUri = null;
+        try {
+            URIBuilder redirectURIBuilder = new URIBuilder(requestContext.getUriInfo().getAbsolutePath());
+            String[] host = url.split(":");
+            redirectURIBuilder.setHost(host[0]);
+            if (host.length == 2 && StringUtils.isNotEmpty(host[1].trim())) {
+                redirectURIBuilder.setPort(Integer.parseInt(host[1].trim()));
+            }
+
+            redirectUri = redirectURIBuilder.build();
+        } catch (URISyntaxException e) {
+            LOG.error("Redirect request exception occurred", e);
+            return;
+        }
+        requestContext.abortWith(Response.temporaryRedirect(redirectUri).build());
+    }
+
+    @NameBinding
+    @Retention(RetentionPolicy.RUNTIME)
+    public @interface RedirectMasterRole {
+    }
+}
diff --git a/...graph-api/src/main/java/org/apache/hugegraph/api/filter/RedirectFilterDynamicFeature.java b/...graph-api/src/main/java/org/apache/hugegraph/api/filter/RedirectFilterDynamicFeature.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with this
+ * work for additional information regarding copyright ownership. The ASF
+ * licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hugegraph.api.filter;
+
+import jakarta.ws.rs.container.DynamicFeature;
+import jakarta.ws.rs.container.ResourceInfo;
+import jakarta.ws.rs.core.FeatureContext;
+import jakarta.ws.rs.ext.Provider;
+
+@Provider
+public class RedirectFilterDynamicFeature implements DynamicFeature {
+
+    @Override
+    public void configure(ResourceInfo resourceInfo, FeatureContext context) {
+        if (resourceInfo.getResourceMethod().isAnnotationPresent(RedirectFilter.RedirectMasterRole.class)) {
+            context.register(RedirectFilter.class);
+        }
+    }
+}
diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/AlgorithmAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/AlgorithmAPI.java
@@ -19,6 +19,7 @@
 
 import java.util.Map;
 
+import org.apache.hugegraph.api.filter.RedirectFilter;
 import org.apache.hugegraph.core.GraphManager;
 import org.apache.hugegraph.server.RestServer;
 import org.slf4j.Logger;
@@ -56,6 +57,7 @@ public class AlgorithmAPI extends API {
     @Status(Status.CREATED)
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @RedirectFilter.RedirectMasterRole
     public Map<String, Id> post(@Context GraphManager manager,
                                 @PathParam("graph") String graph,
                                 @PathParam("name") String algorithm,

diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/ComputerAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/ComputerAPI.java
@@ -29,6 +29,7 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.Context;
 
+import org.apache.hugegraph.api.filter.RedirectFilter;
 import org.apache.hugegraph.core.GraphManager;
 import org.slf4j.Logger;
 
@@ -58,6 +59,7 @@ public class ComputerAPI extends API {
     @Status(Status.CREATED)
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @RedirectFilter.RedirectMasterRole
     public Map<String, Id> post(@Context GraphManager manager,
                                 @PathParam("graph") String graph,
                                 @PathParam("name") String computer,

diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/GremlinAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/GremlinAPI.java
@@ -35,6 +35,7 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.Context;
 
+import org.apache.hugegraph.api.filter.RedirectFilter;
 import org.apache.hugegraph.core.GraphManager;
 import org.apache.hugegraph.define.Checkable;
 import org.apache.hugegraph.metrics.MetricsUtil;
@@ -58,6 +59,7 @@
 @Path("graphs/{graph}/jobs/gremlin")
 @Singleton
 @Tag(name = "GremlinAPI")
+@RedirectFilter.RedirectMasterRole
 public class GremlinAPI extends API {
 
     private static final Logger LOG = Log.logger(GremlinAPI.class);

diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/RebuildAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/RebuildAPI.java
@@ -28,6 +28,7 @@
 import jakarta.ws.rs.Produces;
 import jakarta.ws.rs.core.Context;
 
+import org.apache.hugegraph.api.filter.RedirectFilter;
 import org.apache.hugegraph.api.filter.StatusFilter.Status;
 import org.apache.hugegraph.core.GraphManager;
 import org.slf4j.Logger;
@@ -42,6 +43,7 @@
 @Path("graphs/{graph}/jobs/rebuild")
 @Singleton
 @Tag(name = "RebuildAPI")
+@RedirectFilter.RedirectMasterRole
 public class RebuildAPI extends API {
 
     private static final Logger LOG = Log.logger(RebuildAPI.class);

diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/TaskAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/job/TaskAPI.java
@@ -39,6 +39,7 @@
 import jakarta.ws.rs.core.Context;
 
 import org.apache.groovy.util.Maps;
+import org.apache.hugegraph.api.filter.RedirectFilter;
 import org.apache.hugegraph.api.filter.StatusFilter.Status;
 import org.apache.hugegraph.core.GraphManager;
 import org.slf4j.Logger;
@@ -132,6 +133,7 @@ public Map<String, Object> get(@Context GraphManager manager,
     @DELETE
     @Timed
     @Path("{id}")
+    @RedirectFilter.RedirectMasterRole
     public void delete(@Context GraphManager manager,
                        @PathParam("graph") String graph,
                        @PathParam("id") long id) {
@@ -147,6 +149,7 @@ public void delete(@Context GraphManager manager,
     @Path("{id}")
     @Status(Status.ACCEPTED)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @RedirectFilter.RedirectMasterRole
     public Map<String, Object> update(@Context GraphManager manager,
                                       @PathParam("graph") String graph,
                                       @PathParam("id") long id,

diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/EdgeLabelAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/EdgeLabelAPI.java
@@ -36,6 +36,7 @@
 import jakarta.ws.rs.core.Context;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.hugegraph.api.filter.RedirectFilter;
 import org.apache.hugegraph.core.GraphManager;
 import org.apache.hugegraph.define.Checkable;
 import org.slf4j.Logger;
@@ -68,6 +69,7 @@ public class EdgeLabelAPI extends API {
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
     @RolesAllowed({"admin", "$owner=$graph $action=edge_label_write"})
+    @RedirectFilter.RedirectMasterRole
     public String create(@Context GraphManager manager,
                          @PathParam("graph") String graph,
                          JsonEdgeLabel jsonEdgeLabel) {
@@ -86,6 +88,7 @@ public String create(@Context GraphManager manager,
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
     @RolesAllowed({"admin", "$owner=$graph $action=edge_label_write"})
+    @RedirectFilter.RedirectMasterRole
     public String update(@Context GraphManager manager,
                          @PathParam("graph") String graph,
                          @PathParam("name") String name,
@@ -156,6 +159,7 @@ public String get(@Context GraphManager manager,
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
     @RolesAllowed({"admin", "$owner=$graph $action=edge_label_delete"})
+    @RedirectFilter.RedirectMasterRole
     public Map<String, Id> delete(@Context GraphManager manager,
                                   @PathParam("graph") String graph,
                                   @PathParam("name") String name) {

diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/IndexLabelAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/IndexLabelAPI.java
@@ -36,6 +36,7 @@
 import jakarta.ws.rs.core.Context;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.hugegraph.api.filter.RedirectFilter;
 import org.apache.hugegraph.core.GraphManager;
 import org.apache.hugegraph.define.Checkable;
 import org.slf4j.Logger;
@@ -70,6 +71,7 @@ public class IndexLabelAPI extends API {
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
     @RolesAllowed({"admin", "$owner=$graph $action=index_label_write"})
+    @RedirectFilter.RedirectMasterRole
     public String create(@Context GraphManager manager,
                          @PathParam("graph") String graph,
                          JsonIndexLabel jsonIndexLabel) {
@@ -88,6 +90,7 @@ public String create(@Context GraphManager manager,
     @Path("{name}")
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
+    @RedirectFilter.RedirectMasterRole
     public String update(@Context GraphManager manager,
                          @PathParam("graph") String graph,
                          @PathParam("name") String name,
@@ -157,6 +160,7 @@ public String get(@Context GraphManager manager,
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
     @RolesAllowed({"admin", "$owner=$graph $action=index_label_delete"})
+    @RedirectFilter.RedirectMasterRole
     public Map<String, Id> delete(@Context GraphManager manager,
                                   @PathParam("graph") String graph,
                                   @PathParam("name") String name) {

diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/PropertyKeyAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/PropertyKeyAPI.java
@@ -36,6 +36,7 @@
 import jakarta.ws.rs.core.Context;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.hugegraph.api.filter.RedirectFilter;
 import org.apache.hugegraph.core.GraphManager;
 import org.apache.hugegraph.define.Checkable;
 import org.slf4j.Logger;
@@ -73,6 +74,7 @@ public class PropertyKeyAPI extends API {
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
     @RolesAllowed({"admin", "$owner=$graph $action=property_key_write"})
+    @RedirectFilter.RedirectMasterRole
     public String create(@Context GraphManager manager,
                          @PathParam("graph") String graph,
                          JsonPropertyKey jsonPropertyKey) {
@@ -93,6 +95,7 @@ public String create(@Context GraphManager manager,
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
     @RolesAllowed({"admin", "$owner=$graph $action=property_key_write"})
+    @RedirectFilter.RedirectMasterRole
     public String update(@Context GraphManager manager,
                          @PathParam("graph") String graph,
                          @PathParam("name") String name,
@@ -178,6 +181,7 @@ public String get(@Context GraphManager manager,
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
     @RolesAllowed({"admin", "$owner=$graph $action=property_key_delete"})
+    @RedirectFilter.RedirectMasterRole
     public Map<String, Id> delete(@Context GraphManager manager,
                                   @PathParam("graph") String graph,
                                   @PathParam("name") String name) {

diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/VertexLabelAPI.java b/hugegraph-api/src/main/java/org/apache/hugegraph/api/schema/VertexLabelAPI.java
@@ -36,6 +36,7 @@
 import jakarta.ws.rs.core.Context;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.hugegraph.api.filter.RedirectFilter;
 import org.apache.hugegraph.core.GraphManager;
 import org.apache.hugegraph.define.Checkable;
 import org.slf4j.Logger;
@@ -68,6 +69,7 @@ public class VertexLabelAPI extends API {
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
     @RolesAllowed({"admin", "$owner=$graph $action=vertex_label_write"})
+    @RedirectFilter.RedirectMasterRole
     public String create(@Context GraphManager manager,
                          @PathParam("graph") String graph,
                          JsonVertexLabel jsonVertexLabel) {
@@ -87,6 +89,7 @@ public String create(@Context GraphManager manager,
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
     @RolesAllowed({"admin", "$owner=$graph $action=vertex_label_write"})
+    @RedirectFilter.RedirectMasterRole
     public String update(@Context GraphManager manager,
                          @PathParam("graph") String graph,
                          @PathParam("name") String name,
@@ -159,6 +162,7 @@ public String get(@Context GraphManager manager,
     @Consumes(APPLICATION_JSON)
     @Produces(APPLICATION_JSON_WITH_CHARSET)
     @RolesAllowed({"admin", "$owner=$graph $action=vertex_label_delete"})
+    @RedirectFilter.RedirectMasterRole
     public Map<String, Id> delete(@Context GraphManager manager,
                                   @PathParam("graph") String graph,
                                   @PathParam("name") String name) {

diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/auth/StandardAuthenticator.java b/hugegraph-api/src/main/java/org/apache/hugegraph/auth/StandardAuthenticator.java
@@ -126,6 +126,7 @@ public void setup(HugeConfig config) {
         String raftGroupPeers = config.get(ServerOptions.RAFT_GROUP_PEERS);
         graphConfig.addProperty(ServerOptions.RAFT_GROUP_PEERS.name(),
                                 raftGroupPeers);
+        this.addRoleWorkerConfig(graphConfig, config);
 
         this.graph = (HugeGraph) GraphFactory.open(graphConfig);
 
@@ -137,6 +138,21 @@ public void setup(HugeConfig config) {
         }
     }
 
+    private void addRoleWorkerConfig(HugeConfig graphConfig, HugeConfig config) {
+        graphConfig.addProperty(CoreOptions.NODE_EXTERNAL_URL.name(),
+                    config.get(CoreOptions.NODE_EXTERNAL_URL));
+        graphConfig.addProperty(CoreOptions.BASE_TIMEOUT_MILLISECOND.name(),
+                    config.get(CoreOptions.BASE_TIMEOUT_MILLISECOND));
+        graphConfig.addProperty(CoreOptions.EXCEEDS_FAIL_COUNT.name(),
+                    config.get(CoreOptions.EXCEEDS_FAIL_COUNT));
+        graphConfig.addProperty(CoreOptions.RANDOM_TIMEOUT_MILLISECOND.name(),
+                    config.get(CoreOptions.RANDOM_TIMEOUT_MILLISECOND));
+        graphConfig.addProperty(CoreOptions.HEARTBEAT_INTERVAL_SECOUND.name(),
+                    config.get(CoreOptions.HEARTBEAT_INTERVAL_SECOUND));
+        graphConfig.addProperty(CoreOptions.EXCEEDS_WORKER_COUNT.name(),
+                    config.get(CoreOptions.EXCEEDS_WORKER_COUNT));
+    }
+
     /**
      * Verify if a user is legal
      * @param username the username for authentication

diff --git a/hugegraph-api/src/main/java/org/apache/hugegraph/core/GraphManager.java b/hugegraph-api/src/main/java/org/apache/hugegraph/core/GraphManager.java
@@ -369,6 +369,7 @@ private void loadGraph(String name, String graphConfPath) {
         String raftGroupPeers = this.conf.get(ServerOptions.RAFT_GROUP_PEERS);
         config.addProperty(ServerOptions.RAFT_GROUP_PEERS.name(),
                            raftGroupPeers);
+        this.addRoleWorkerConfig(config);
 
         Graph graph = GraphFactory.open(config);
         this.graphs.put(name, graph);
@@ -386,6 +387,21 @@ private void loadGraph(String name, String graphConfPath) {
         }
     }
 
+    private void addRoleWorkerConfig(HugeConfig config) {
+        config.addProperty(CoreOptions.NODE_EXTERNAL_URL.name(),
+                           this.conf.get(CoreOptions.NODE_EXTERNAL_URL));
+        config.addProperty(CoreOptions.BASE_TIMEOUT_MILLISECOND.name(),
+                           this.conf.get(CoreOptions.BASE_TIMEOUT_MILLISECOND));
+        config.addProperty(CoreOptions.EXCEEDS_FAIL_COUNT.name(),
+                           this.conf.get(CoreOptions.EXCEEDS_FAIL_COUNT));
+        config.addProperty(CoreOptions.RANDOM_TIMEOUT_MILLISECOND.name(),
+                           this.conf.get(CoreOptions.RANDOM_TIMEOUT_MILLISECOND));
+        config.addProperty(CoreOptions.HEARTBEAT_INTERVAL_SECOUND.name(),
+                           this.conf.get(CoreOptions.HEARTBEAT_INTERVAL_SECOUND));
+        config.addProperty(CoreOptions.EXCEEDS_WORKER_COUNT.name(),
+                           this.conf.get(CoreOptions.EXCEEDS_WORKER_COUNT));
+    }
+
     private void waitGraphsReady() {
         if (!this.rpcServer.enabled()) {
             LOG.info("RpcServer is not enabled, skip wait graphs ready");