Skip to content

Commit

Permalink
some more akka leftovers in deployment
Browse files Browse the repository at this point in the history
Signed-off-by: Stanchev Aleksandar <aleksandar.stanchev@bosch.com>
  • Loading branch information
alstanchev authored and Aleksandar Stanchev committed Aug 28, 2023
1 parent 38096e5 commit 6556895
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 20 deletions.
Expand Up @@ -374,7 +374,7 @@ private void addCoordinatedShutdownTasks() {
cancelOnStopTasks.add(coordinatedShutdown.addCancellableTask(CoordinatedShutdown.PhaseServiceUnbind(),
"service-unbind-" + id, askSelfShutdownTask(Control.SERVICE_UNBIND)));
coordinatedShutdown.addActorTerminationTask(CoordinatedShutdown.PhaseServiceRequestsDone(),
"service-requests-done" + id, getSelf(), Optional.of(Control.SERVICE_REQUESTS_DONE));
"service-requests-done-" + id, getSelf(), Optional.of(Control.SERVICE_REQUESTS_DONE));
}

private boolean shouldAnyTargetSendConnectionAnnouncements() {
Expand Down
Expand Up @@ -281,7 +281,7 @@ spec:
memory: {{ .Values.connectivity.resources.memoryMi }}Mi
limits:
# ## no cpu limit to avoid CFS scheduler limits
# ref: https://doc.akka.io/docs/akka/snapshot/additional/deploy.html#in-kubernetes
# ref: https://pekko.apache.org/docs/pekko/current/additional/deploying.html#deploying-to-kubernetes
# cpu: ""
memory: {{ .Values.connectivity.resources.memoryMi }}Mi
{{- if .Values.openshift.enabled }}
Expand Down
6 changes: 3 additions & 3 deletions deployment/helm/ditto/templates/gateway-deployment.yaml
Expand Up @@ -207,10 +207,10 @@ spec:
containerPort: {{ .Values.gateway.service.port }}
protocol: TCP
- name: remoting
containerPort: {{ .Values.akka.remoting.port }}
containerPort: {{ .Values.pekko.remoting.port }}
protocol: TCP
- name: management
containerPort: {{ .Values.akka.mgmthttp.port }}
containerPort: {{ .Values.pekko.mgmthttp.port }}
protocol: TCP
{{- if .Values.global.prometheus.enabled }}
- name: prometheus
Expand Down Expand Up @@ -251,7 +251,7 @@ spec:
memory: {{ .Values.gateway.resources.memoryMi }}Mi
limits:
# ## no cpu limit to avoid CFS scheduler limits
# ref: https://doc.akka.io/docs/akka/snapshot/additional/deploy.html#in-kubernetes
# ref: https://pekko.apache.org/docs/pekko/current/additional/deploying.html#deploying-to-kubernetes
# cpu: ""
memory: {{ .Values.gateway.resources.memoryMi }}Mi
{{- if .Values.openshift.enabled }}
Expand Down
6 changes: 3 additions & 3 deletions deployment/helm/ditto/templates/policies-deployment.yaml
Expand Up @@ -224,10 +224,10 @@ spec:
containerPort: 8080
protocol: TCP
- name: remoting
containerPort: {{ .Values.akka.remoting.port }}
containerPort: {{ .Values.pekko.remoting.port }}
protocol: TCP
- name: management
containerPort: {{ .Values.akka.mgmthttp.port }}
containerPort: {{ .Values.pekko.mgmthttp.port }}
protocol: TCP
{{- if .Values.global.prometheus.enabled }}
- name: prometheus
Expand Down Expand Up @@ -268,7 +268,7 @@ spec:
memory: {{ .Values.policies.resources.memoryMi }}Mi
limits:
# ## no cpu limit to avoid CFS scheduler limits
# ref: https://doc.akka.io/docs/akka/snapshot/additional/deploy.html#in-kubernetes
# ref: https://pekko.apache.org/docs/pekko/current/additional/deploying.html#deploying-to-kubernetes
# cpu: ""
memory: {{ .Values.policies.resources.memoryMi }}Mi
{{- if .Values.openshift.enabled }}
Expand Down
2 changes: 1 addition & 1 deletion deployment/helm/ditto/templates/things-deployment.yaml
Expand Up @@ -272,7 +272,7 @@ spec:
memory: {{ .Values.things.resources.memoryMi }}Mi
limits:
# ## no cpu limit to avoid CFS scheduler limits
# ref: https://doc.akka.io/docs/akka/snapshot/additional/deploy.html#in-kubernetes
# ref: https://pekko.apache.org/docs/pekko/current/additional/deploying.html#deploying-to-kubernetes
# cpu: ""
memory: {{ .Values.things.resources.memoryMi }}Mi
{{- if .Values.openshift.enabled }}
Expand Down
Expand Up @@ -252,7 +252,7 @@ spec:
memory: {{ .Values.thingsSearch.resources.memoryMi }}Mi
limits:
# ## no cpu limit to avoid CFS scheduler limits
# ref: https://doc.akka.io/docs/akka/snapshot/additional/deploy.html#in-kubernetes
# ref: https://pekko.apache.org/docs/pekko/current/additional/deploying.html#deploying-to-kubernetes
# cpu: ""
memory: {{ .Values.thingsSearch.resources.memoryMi }}Mi
{{- if .Values.openshift.enabled }}
Expand Down
8 changes: 4 additions & 4 deletions deployment/helm/ditto/values.yaml
Expand Up @@ -373,7 +373,7 @@ pekko:
port: 2551
# mgmthttp holds configuration for the Pekko cluster management
mgmthttp:
# port defines the Port to use for akka http management
# port defines the Port to use for pekko http management
port: 8558

# Set "dittoTag" in order to specify another Ditto version to use for all Ditto services:
Expand Down Expand Up @@ -533,7 +533,7 @@ policies:
timerThreshold: 100ms
# creditsPerBatch configures how many "cleanup credits" should be generated per "interval" as long as the
creditsPerBatch: 5
# persistence holds configuration regarding (akka) persistence of policies (event journal and snapshots)
# persistence holds configuration regarding (pekko) persistence of policies (event journal and snapshots)
persistence:
# activityCheckInterval configures to keep policies for that amount of time in memory when no other use did happen:
activityCheckInterval: 2d
Expand Down Expand Up @@ -727,7 +727,7 @@ things:
timerThreshold: 100ms
# creditsPerBatch configures how many "cleanup credits" should be generated per "interval" as long as the
creditsPerBatch: 5
# persistence holds configuration regarding (akka) persistence of things (event journal and snapshots)
# persistence holds configuration regarding (pekko) persistence of things (event journal and snapshots)
persistence:
# activityCheckInterval configures to keep things for that amount of time in memory when no other use did happen
activityCheckInterval: 2d
Expand Down Expand Up @@ -1131,7 +1131,7 @@ connectivity:
timerThreshold: 100ms
# creditsPerBatch configures how many "cleanup credits" should be generated per "interval" as long as the
creditsPerBatch: 5
# persistence holds configuration regarding (akka) persistence of connections (event journal and snapshots)
# persistence holds configuration regarding (pekko) persistence of connections (event journal and snapshots)
persistence:
# keep closed, inactive connections for that amount of time in memory when no other use did happen:
activityCheckInterval: 45m
Expand Down
Expand Up @@ -339,7 +339,7 @@ spec:
# cpu: "1"
# memory: "1Gi"
# limits:
# # cpu: "" no cpu limit to avoid CFS scheduler limits see https://doc.akka.io/docs/akka/snapshot/additional/deploy.html#in-kubernetes
# # cpu: "" no cpu limit to avoid CFS scheduler limits see https://pekko.apache.org/docs/pekko/current/additional/deploying.html#deploying-to-kubernetes
# memory: "2Gi"
volumeMounts:
- name: ditto-log-files-directory
Expand Down Expand Up @@ -381,7 +381,7 @@ spec:
- name: TZ
value: "Europe/Berlin"
- name: JAVA_TOOL_OPTIONS
value: "-XX:ActiveProcessorCount=2 -XX:+ExitOnOutOfMemoryError -XX:+UseContainerSupport -XX:+UseStringDeduplication -Xss512k -XX:MaxRAMPercentage=50 -XX:+UseG1GC -XX:MaxGCPauseMillis=150 -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=60s -Dakka.cluster.failure-detector.threshold=15.0 -Dakka.cluster.failure-detector.expected-response-after=10s -Dakka.cluster.failure-detector.acceptable-heartbeat-pause=30s"
value: "-XX:ActiveProcessorCount=2 -XX:+ExitOnOutOfMemoryError -XX:+UseContainerSupport -XX:+UseStringDeduplication -Xss512k -XX:MaxRAMPercentage=50 -XX:+UseG1GC -XX:MaxGCPauseMillis=150 -Dpekko.coordinated-shutdown.exit-jvm=on -Dpekko.cluster.shutdown-after-unsuccessful-join-seed-nodes=60s -Dpekko.cluster.failure-detector.threshold=15.0 -Dpekko.cluster.failure-detector.expected-response-after=10s -Dpekko.cluster.failure-detector.acceptable-heartbeat-pause=30s"
- name: MONGO_DB_HOSTNAME
value: "mongodb"
# in order to read the MONGO_DB_URI from a kubernetes secret replace the above lines for MONGO_DB_HOSTNAME with the following ones
Expand Down Expand Up @@ -439,7 +439,7 @@ spec:
# cpu: "1"
# memory: "512Mi"
# limits:
# # cpu: "{{ item.cpus }}" no cpu limit to avoid CFS scheduler limits see https://doc.akka.io/docs/akka/snapshot/additional/deploy.html#in-kubernetes
# # cpu: "{{ item.cpus }}" no cpu limit to avoid CFS scheduler limits see https://pekko.apache.org/docs/pekko/current/additional/deploying.html#deploying-to-kubernetes
# memory: "2Gi"
volumeMounts:
- name: ditto-log-files-directory
Expand Down Expand Up @@ -483,7 +483,7 @@ spec:
- name: TZ
value: "Europe/Berlin"
- name: JAVA_TOOL_OPTIONS
value: "-XX:ActiveProcessorCount=2 -XX:+ExitOnOutOfMemoryError -XX:+UseContainerSupport -XX:+UseStringDeduplication -Xss512k -XX:MaxRAMPercentage=50 -XX:+UseG1GC -XX:MaxGCPauseMillis=150 -Dakka.coordinated-shutdown.exit-jvm=on -Dakka.cluster.shutdown-after-unsuccessful-join-seed-nodes=60s -Dakka.cluster.failure-detector.threshold=15.0 -Dakka.cluster.failure-detector.expected-response-after=10s -Dakka.cluster.failure-detector.acceptable-heartbeat-pause=30s"
value: "-XX:ActiveProcessorCount=2 -XX:+ExitOnOutOfMemoryError -XX:+UseContainerSupport -XX:+UseStringDeduplication -Xss512k -XX:MaxRAMPercentage=50 -XX:+UseG1GC -XX:MaxGCPauseMillis=150 -Dpekko.coordinated-shutdown.exit-jvm=on -Dpekko.cluster.shutdown-after-unsuccessful-join-seed-nodes=60s -Dpekko.cluster.failure-detector.threshold=15.0 -Dpekko.cluster.failure-detector.expected-response-after=10s -Dpekko.cluster.failure-detector.acceptable-heartbeat-pause=30s"
# in order to write logs into a file you can enable this by setting the following env variable
# the log file(s) can be found in /var/log/ditto directory on the host machine
#- name: DITTO_LOGGING_FILE_APPENDER
Expand Down
Expand Up @@ -785,7 +785,7 @@
"name": "Application",
"options": [],
"query": {
"query": "label_values(akka_persistence_mongo_journal_scala_official_read_max_seq_seconds_bucket, job)",
"query": "label_values(pekko_persistence_mongo_journal_scala_official_read_max_seq_seconds_bucket, job)",
"refId": "prometheus-Application-Variable-Query"
},
"refresh": 1,
Expand Down
Expand Up @@ -33,7 +33,7 @@ addressed this issue with the following changes:
### [Netty 3 was removed from dependencies](https://github.com/eclipse-ditto/ditto/issues/161)

Due to licensing issues with Netty 3, it was removed in this release and replaced with
[Pekko's Artery](https://doc.akka.io/docs/akka/current/remoting-artery.html) remoting which uses by default a plain TCP
[Akka's Artery](https://doc.akka.io/docs/akka/current/remoting-artery.html) remoting which uses by default a plain TCP
socket for communication.

That means that a rolling update from a prior version of Ditto will fail - you'll have to completely restart your
Expand Down

0 comments on commit 6556895

Please sign in to comment.