Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(interactive): Decouple ingestor and store, remote direct RPC connections. #3525

Merged
merged 13 commits into from
Feb 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions charts/gie-standalone/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ If release name contains chart name it will be used as a full name.
{{- printf "%s-%s" (include "graphscope-store.fullname" .) "frontend" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{- define "graphscope-store.ingestor.fullname" -}}
{{- printf "%s-%s" (include "graphscope-store.fullname" .) "ingestor" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{- define "graphscope-store.store.fullname" -}}
{{- printf "%s-%s" (include "graphscope-store.fullname" .) "store" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
Expand Down
4 changes: 0 additions & 4 deletions charts/graphscope-store-one-pod/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ If release name contains chart name it will be used as a full name.
{{- printf "%s-%s" (include "graphscope-store.fullname" .) "frontend" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{- define "graphscope-store.ingestor.fullname" -}}
{{- printf "%s-%s" (include "graphscope-store.fullname" .) "ingestor" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{- define "graphscope-store.store.fullname" -}}
{{- printf "%s-%s" (include "graphscope-store.fullname" .) "store" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
Expand Down
8 changes: 0 additions & 8 deletions charts/graphscope-store-one-pod/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,14 @@ data:
rpc.max.bytes.mb={{ .Values.rpcMaxBytesMb }}
store.node.count={{ .Values.store.replicaCount }}
frontend.node.count=1
ingestor.node.count={{ .Values.ingestor.replicaCount }}
coordinator.node.count=1
ingestor.queue.count={{ .Values.ingestor.replicaCount }}
partition.count={{ .Values.store.replicaCount | mul 16 }}
discovery.mode=zookeeper

## Frontend Config
frontend.server.num=1
enable.hash.generate.eid={{ .Values.enableHashGenerateEid }}

## Ingestor Config
ingestor.queue.buffer.max.count={{ .Values.ingestorQueueBufferMaxCount }}
ingestor.sender.buffer.max.count={{ .Values.ingestorSenderBufferMaxCount }}
ingestor.sender.operation.max.count={{ .Values.ingestorSenderOperationMaxCount }}

## Coordinator Config
snapshot.increase.interval.ms={{ .Values.snapshotIncreaseIntervalMs }}
offsets.persist.interval.ms={{ .Values.offsetsPersistIntervalMs }}
Expand All @@ -53,7 +46,6 @@ data:
neo4j.bolt.server.disabled=true

dns.name.prefix.frontend=localhost
dns.name.prefix.ingestor=localhost
dns.name.prefix.coordinator=localhost
dns.name.prefix.store=localhost

Expand Down
35 changes: 0 additions & 35 deletions charts/graphscope-store-one-pod/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,36 +122,6 @@ frontend:
##
annotations: {}

ingestor:
replicaCount: 2

## @param hostAliases pods host aliases
## https://kubernetes.io/docs/concepts/services-networking/add-entries-to-pod-etc-hosts-with-host-aliases/
##
hostAliases: []
## @param hostNetwork Specify if host network should be enabled for pods
##
hostNetwork: false
## @param hostIPC Specify if host IPC should be enabled for pods
##
hostIPC: false
## @param podLabels Extra labels for pods
## Ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
##
podLabels: {}
## @param podAnnotations Extra annotations for pods
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
##
podAnnotations: {}
## @param podAffinityPreset Pod affinity preset. Ignored if `affinity` is set. Allowed values: `soft` or `hard`
## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
##

## ref: https://kubernetes.io/docs/tasks/administer-cluster/configure-multiple-schedulers/
##
schedulerName: ""


## @section Common parameters
##

Expand Down Expand Up @@ -350,11 +320,6 @@ javaOpts: ""

rpcMaxBytesMb: 20

## Ingestor Config
ingestorQueueBufferMaxCount: 102400
ingestorSenderBufferMaxCount: 102400
ingestorSenderOperationMaxCount: 102400

## Coordinator Config
snapshotIncreaseIntervalMs: 1000
offsetsPersistIntervalMs: 3000
Expand Down
1 change: 0 additions & 1 deletion charts/graphscope-store/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,6 @@ Here we give a list of most frequently used parameters.
| store.replicaCount | Number of nodes | 2 |
| frontend.replicaCount | Number of nodes | 1 |
| frontend.service.type| Kubernetes Service type| NodePort |
| ingestor.replicaCount | Number of nodes | 1 |
| coordinator.replicaCount | Number of nodes | 1 |

### Kafka chart parameters
Expand Down
4 changes: 0 additions & 4 deletions charts/graphscope-store/templates/_helpers.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,6 @@ If release name contains chart name it will be used as a full name.
{{- printf "%s-%s" (include "graphscope-store.fullname" .) "frontend" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{- define "graphscope-store.ingestor.fullname" -}}
{{- printf "%s-%s" (include "graphscope-store.fullname" .) "ingestor" | trunc 63 | trimSuffix "-" -}}
{{- end -}}

{{- define "graphscope-store.store.fullname" -}}
{{- printf "%s-%s" (include "graphscope-store.fullname" .) "store" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
Expand Down
9 changes: 0 additions & 9 deletions charts/graphscope-store/templates/configmap.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ data:
rpc.max.bytes.mb={{ .Values.rpcMaxBytesMb }}
store.node.count={{ .Values.store.replicaCount }}
frontend.node.count={{ .Values.frontend.replicaCount }}
ingestor.node.count={{ .Values.ingestor.replicaCount }}
coordinator.node.count={{ .Values.coordinator.replicaCount }}
ingestor.queue.count={{ .Values.ingestor.replicaCount }}
partition.count={{ .Values.store.replicaCount | mul 16 }}
discovery.mode={{ .Values.discoveryMode }}
Expand All @@ -33,11 +31,6 @@ data:
frontend.server.num={{ .Values.frontend.replicaCount }}
enable.hash.generate.eid={{ .Values.enableHashGenerateEid }}
## Ingestor Config
ingestor.queue.buffer.max.count={{ .Values.ingestorQueueBufferMaxCount }}
ingestor.sender.buffer.max.count={{ .Values.ingestorSenderBufferMaxCount }}
ingestor.sender.operation.max.count={{ .Values.ingestorSenderOperationMaxCount }}
## Coordinator Config
snapshot.increase.interval.ms={{ .Values.snapshotIncreaseIntervalMs }}
offsets.persist.interval.ms={{ .Values.offsetsPersistIntervalMs }}
Expand All @@ -61,7 +54,6 @@ data:
neo4j.bolt.server.disabled=true
dns.name.prefix.frontend=FRONTEND
dns.name.prefix.ingestor=INGESTOR
dns.name.prefix.coordinator=COORDINATOR
dns.name.prefix.store=STORE
Expand Down Expand Up @@ -118,7 +110,6 @@ data:
-e "s/INDEX/${ordinal}/g" \
-e "s/KAFKA_SERVERS/${KAFKA_SERVERS}/g" \
-e "s/FRONTEND/${DNS_NAME_PREFIX_FRONTEND}/g" \
-e "s/INGESTOR/${DNS_NAME_PREFIX_INGESTOR}/g" \
-e "s/COORDINATOR/${DNS_NAME_PREFIX_COORDINATOR}/g" \
-e "s/STORE/${DNS_NAME_PREFIX_STORE}/g" \
-e "s/PEGASUS_HOSTS/${pegasus_hosts}/g" \
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{- $frontendFullname := include "graphscope-store.frontend.fullname" . }}
{{- $ingestorFullname := include "graphscope-store.ingestor.fullname" . }}
{{- $coordinatorFullname := include "graphscope-store.coordinator.fullname" . }}
{{- $storeFullname := include "graphscope-store.store.fullname" . }}
{{- $kafkaFullname := include "graphscope-store.kafka.fullname" . -}}
Expand Down Expand Up @@ -110,16 +109,12 @@ spec:
value: "coordinator"
- name: FRONTEND_COUNT
value: {{ .Values.frontend.replicaCount | quote }}
- name: INGESTOR_COUNT
value: {{ .Values.ingestor.replicaCount | quote }}
- name: COORDINATOR_COUNT
value: {{ .Values.coordinator.replicaCount | quote }}
- name: STORE_COUNT
value: {{ .Values.store.replicaCount | quote }}
- name: DNS_NAME_PREFIX_FRONTEND
value: {{ $frontendFullname }}-{}.{{ $frontendFullname }}-headless
- name: DNS_NAME_PREFIX_INGESTOR
value: {{ $ingestorFullname }}-{}.{{ $ingestorFullname }}-headless
- name: DNS_NAME_PREFIX_COORDINATOR
value: {{ $coordinatorFullname }}-{}.{{ $coordinatorFullname }}-headless
- name: DNS_NAME_PREFIX_STORE
Expand Down
5 changes: 0 additions & 5 deletions charts/graphscope-store/templates/frontend/statefulset.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
{{- $frontendFullname := include "graphscope-store.frontend.fullname" . }}
{{- $ingestorFullname := include "graphscope-store.ingestor.fullname" . }}
{{- $coordinatorFullname := include "graphscope-store.coordinator.fullname" . }}
{{- $storeFullname := include "graphscope-store.store.fullname" . }}
{{- $kafkaFullname := include "graphscope-store.kafka.fullname" . -}}
Expand Down Expand Up @@ -110,16 +109,12 @@ spec:
value: "frontend"
- name: FRONTEND_COUNT
value: {{ .Values.frontend.replicaCount | quote }}
- name: INGESTOR_COUNT
value: {{ .Values.ingestor.replicaCount | quote }}
- name: COORDINATOR_COUNT
value: {{ .Values.coordinator.replicaCount | quote }}
- name: STORE_COUNT
value: {{ .Values.store.replicaCount | quote }}
- name: DNS_NAME_PREFIX_FRONTEND
value: {{ $frontendFullname }}-{}.{{ $frontendFullname }}-headless
- name: DNS_NAME_PREFIX_INGESTOR
value: {{ $ingestorFullname }}-{}.{{ $ingestorFullname }}-headless
- name: DNS_NAME_PREFIX_COORDINATOR
value: {{ $coordinatorFullname }}-{}.{{ $coordinatorFullname }}-headless
- name: DNS_NAME_PREFIX_STORE
Expand Down
148 changes: 0 additions & 148 deletions charts/graphscope-store/templates/ingestor/statefulset.yaml

This file was deleted.

24 changes: 0 additions & 24 deletions charts/graphscope-store/templates/ingestor/svc-headless.yaml

This file was deleted.

Loading
Loading