Fix dns search error in groot (#2850)

alibaba · Jun 9, 2023 · 434acdf · 434acdf
1 parent 9bf071c
commit 434acdf
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 32 deletions.
diff --git a/charts/graphscope-store/templates/configmap.yaml b/charts/graphscope-store/templates/configmap.yaml
@@ -25,7 +25,7 @@ data:
     ingestor.node.count={{ .Values.ingestor.replicaCount }}
     coordinator.node.count={{ .Values.coordinator.replicaCount }}
     ingestor.queue.count={{ .Values.ingestor.replicaCount }}
-    partition.count={{ .Values.store.replicaCount | mul 8 }}
+    partition.count={{ .Values.store.replicaCount | mul 128 }}
     engine.type={{ .Values.engineType }}
     discovery.mode={{ .Values.discoveryMode }}
 

diff --git a/charts/graphscope-store/templates/coordinator/statefulset.yaml b/charts/graphscope-store/templates/coordinator/statefulset.yaml
@@ -128,6 +128,9 @@ spec:
               value: {{ $kafkaFullname}}-headless.{{ $releaseNamespace }}
             - name: KAFKA_SERVERS
               value: {{ include "graphscope-store.kafka.brokerlist" . }}
+          ports:
+            - name: port
+              containerPort: 55555
           {{- if .Values.coordinator.resources }}
           resources: {{- toYaml .Values.coordinator.resources | nindent 12 }}
           {{- end }}

diff --git a/charts/graphscope-store/templates/coordinator/svc-headless.yaml b/charts/graphscope-store/templates/coordinator/svc-headless.yaml
@@ -20,11 +20,5 @@ spec:
     - name: port
       port: {{ .Values.coordinator.service.port }}
       targetPort: port
-    - name: gaia-rpc
-      port: {{ .Values.coordinator.service.gaiaRpc }}
-      targetPort: gaia-rpc
-    - name: gaia-engine
-      port: {{ .Values.coordinator.service.gaiaEngine }}
-      targetPort: gaia-engine
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
     app.kubernetes.io/component: coordinator
diff --git a/charts/graphscope-store/templates/frontend/statefulset.yaml b/charts/graphscope-store/templates/frontend/statefulset.yaml
@@ -133,6 +133,8 @@ spec:
               containerPort: 55556
             - name: gremlin
               containerPort: 12312
+            - name: port
+              containerPort: 55555
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.livenessProbe "enabled") "context" $) | nindent 12 }}
             tcpSocket:

diff --git a/charts/graphscope-store/templates/frontend/svc-headless.yaml b/charts/graphscope-store/templates/frontend/svc-headless.yaml
@@ -23,11 +23,5 @@ spec:
     - name: port
       port: {{ .Values.frontend.service.port }}
       targetPort: port
-    - name: gaia-rpc
-      port: {{ .Values.frontend.service.gaiaRpc }}
-      targetPort: gaia-rpc
-    - name: gaia-engine
-      port: {{ .Values.frontend.service.gaiaEngine }}
-      targetPort: gaia-engine
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
     app.kubernetes.io/component: frontend
diff --git a/charts/graphscope-store/templates/ingestor/statefulset.yaml b/charts/graphscope-store/templates/ingestor/statefulset.yaml
@@ -128,6 +128,9 @@ spec:
               value: {{ $kafkaFullname}}-headless.{{ $releaseNamespace }}
             - name: KAFKA_SERVERS
               value: {{ include "graphscope-store.kafka.brokerlist" . }}
+          ports:
+            - name: port
+              containerPort: 55555
           {{- if .Values.ingestor.resources }}
           resources: {{- toYaml .Values.ingestor.resources | nindent 12 }}
           {{- end }}

diff --git a/charts/graphscope-store/templates/ingestor/svc-headless.yaml b/charts/graphscope-store/templates/ingestor/svc-headless.yaml
@@ -20,11 +20,5 @@ spec:
     - name: port
       port: {{ .Values.ingestor.service.port }}
       targetPort: port
-    - name: gaia-rpc
-      port: {{ .Values.ingestor.service.gaiaRpc }}
-      targetPort: gaia-rpc
-    - name: gaia-engine
-      port: {{ .Values.ingestor.service.gaiaEngine }}
-      targetPort: gaia-engine
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
     app.kubernetes.io/component: ingestor
diff --git a/charts/graphscope-store/templates/store/statefulset.yaml b/charts/graphscope-store/templates/store/statefulset.yaml
@@ -128,6 +128,13 @@ spec:
               value: {{ $kafkaFullname}}-headless.{{ $releaseNamespace }}
             - name: KAFKA_SERVERS
               value: {{ include "graphscope-store.kafka.brokerlist" . }}
+          ports:
+            - name: port
+              containerPort: 55555
+            - name: gaia-rpc
+              containerPort: 60000
+            - name: gaia-engine
+              containerPort: 60001
           {{- if .Values.store.resources }}
           resources: {{- toYaml .Values.store.resources | nindent 12 }}
           {{- end }}

diff --git a/charts/graphscope-store/templates/store/svc-headless.yaml b/charts/graphscope-store/templates/store/svc-headless.yaml
@@ -17,9 +17,9 @@ spec:
   clusterIP: None
   publishNotReadyAddresses: true
   ports:
-    - name: engine
-      port: {{ .Values.store.service.engine }}
-      targetPort: engine
+    - name: port
+      port: {{ .Values.store.service.port }}
+      targetPort: port
     - name: gaia-rpc
       port: {{ .Values.store.service.gaiaRpc }}
       targetPort: gaia-rpc

diff --git a/charts/graphscope-store/values.yaml b/charts/graphscope-store/values.yaml
@@ -82,7 +82,7 @@ store:
     type: ClusterIP
     ## Service port
     ##
-    engine: 55556
+    port: 55555
     gaiaRpc: 60000
     gaiaEngine: 60001
 
@@ -139,10 +139,6 @@ frontend:
     ##
     port: 55555
 
-    gaiaRpc: 60000
-
-    gaiaEngine: 60001
-
     ## Specify the nodePort value for the LoadBalancer and NodePort service types.
     ## ref: https://kubernetes.io/docs/concepts/services-networking/service/#type-nodeport
     ##
@@ -213,8 +209,6 @@ ingestor:
   service:
     type: ClusterIP
     port: 55555
-    gaiaRpc: 60000
-    gaiaEngine: 60001
     annotations: {}
 
   ## @param hostAliases pods host aliases
@@ -277,8 +271,6 @@ coordinator:
   service:
     type: ClusterIP
     port: 55555
-    gaiaRpc: 60000
-    gaiaEngine: 60001
     annotations: {}
 
   ## @param hostAliases pods host aliases

diff --git a/...ve_engine/groot-module/src/main/java/com/alibaba/graphscope/groot/store/StoreService.java b/...ve_engine/groot-module/src/main/java/com/alibaba/graphscope/groot/store/StoreService.java
@@ -389,7 +389,7 @@ public void garbageCollect(long snapshotId, CompletionCallback<Void> callback) {
         this.garbageCollectExecutor.execute(
                 () -> {
                     try {
-                        logger.info("Garbage collecting, snapshot [{}]", snapshotId);
+                        logger.debug("Garbage collecting, snapshot [{}]", snapshotId);
                         garbageCollectInternal(snapshotId);
                         callback.onCompleted(null);
                     } catch (Exception e) {