This is an automated email from the ASF dual-hosted git repository.
adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 54b0c310ac HDDS-5471. Enable SCM HA in ozone-ha Kubernetes example
(#2447)
54b0c310ac is described below
commit 54b0c310acb539b081bb638b05d7a39d54e2603a
Author: Jie Yao <[email protected]>
AuthorDate: Tue Jul 11 15:41:11 2023 +0800
HDDS-5471. Enable SCM HA in ozone-ha Kubernetes example (#2447)
Co-authored-by: Doroszlai, Attila <[email protected]>
---
.../examples/getting-started/config-configmap.yaml | 1 +
.../k8s/examples/minikube/config-configmap.yaml | 1 +
.../k8s/examples/ozone-dev/config-configmap.yaml | 1 +
.../dist/src/main/k8s/examples/ozone-ha/Flekszible | 1 +
.../k8s/examples/ozone-ha/config-configmap.yaml | 11 +++++---
.../main/k8s/examples/ozone-ha/om-statefulset.yaml | 2 +-
.../k8s/examples/ozone-ha/s3g-statefulset.yaml | 2 +-
.../k8s/examples/ozone-ha/scm-statefulset.yaml | 16 ++++++++++--
.../k8s/examples/ozone-ha/{Flekszible => test.sh} | 30 ++++++++++------------
.../k8s/examples/ozone/datanode-statefulset.yaml | 2 --
.../main/k8s/examples/ozone/om-statefulset.yaml | 3 +--
.../main/k8s/examples/ozone/s3g-statefulset.yaml | 3 +--
.../main/k8s/examples/ozone/scm-statefulset.yaml | 4 +--
13 files changed, 44 insertions(+), 33 deletions(-)
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/getting-started/config-configmap.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/getting-started/config-configmap.yaml
index 5bd722da98..b3acc6f1d2 100644
---
a/hadoop-ozone/dist/src/main/k8s/examples/getting-started/config-configmap.yaml
+++
b/hadoop-ozone/dist/src/main/k8s/examples/getting-started/config-configmap.yaml
@@ -28,6 +28,7 @@ data:
OZONE-SITE.XML_ozone.scm.names: scm-0.scm
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "3"
OZONE-SITE.XML_ozone.datanode.pipeline.limit: "1"
+ OZONE-SITE.XML_dfs.datanode.use.datanode.hostname: "true"
LOG4J.PROPERTIES_log4j.rootLogger: INFO, stdout
LOG4J.PROPERTIES_log4j.appender.stdout: org.apache.log4j.ConsoleAppender
LOG4J.PROPERTIES_log4j.appender.stdout.layout: org.apache.log4j.PatternLayout
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/minikube/config-configmap.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/minikube/config-configmap.yaml
index 5bd722da98..b3acc6f1d2 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/minikube/config-configmap.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/minikube/config-configmap.yaml
@@ -28,6 +28,7 @@ data:
OZONE-SITE.XML_ozone.scm.names: scm-0.scm
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "3"
OZONE-SITE.XML_ozone.datanode.pipeline.limit: "1"
+ OZONE-SITE.XML_dfs.datanode.use.datanode.hostname: "true"
LOG4J.PROPERTIES_log4j.rootLogger: INFO, stdout
LOG4J.PROPERTIES_log4j.appender.stdout: org.apache.log4j.ConsoleAppender
LOG4J.PROPERTIES_log4j.appender.stdout.layout: org.apache.log4j.PatternLayout
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/config-configmap.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/config-configmap.yaml
index 4be594b99b..122382afdb 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/config-configmap.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-dev/config-configmap.yaml
@@ -28,6 +28,7 @@ data:
OZONE-SITE.XML_ozone.scm.names: scm-0.scm
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "3"
OZONE-SITE.XML_ozone.datanode.pipeline.limit: "1"
+ OZONE-SITE.XML_dfs.datanode.use.datanode.hostname: "true"
LOG4J.PROPERTIES_log4j.rootLogger: INFO, stdout
LOG4J.PROPERTIES_log4j.appender.stdout: org.apache.log4j.ConsoleAppender
LOG4J.PROPERTIES_log4j.appender.stdout.layout: org.apache.log4j.PatternLayout
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
index 445f255028..26a157f6e7 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
@@ -20,6 +20,7 @@ import:
transformations:
- type: Image
image: "@docker.image@"
+ - type: ozone/scm-ha
- type: ozone/persistence
- path: ozone/freon
destination: freon
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/config-configmap.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/config-configmap.yaml
index 5bd722da98..61555e1eb5 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/config-configmap.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/config-configmap.yaml
@@ -22,14 +22,19 @@ data:
OZONE-SITE.XML_hdds.datanode.dir: /data/storage
OZONE-SITE.XML_ozone.scm.datanode.id.dir: /data
OZONE-SITE.XML_ozone.metadata.dirs: /data/metadata
- OZONE-SITE.XML_ozone.scm.block.client.address: scm-0.scm
OZONE-SITE.XML_ozone.om.address: om-0.om
- OZONE-SITE.XML_ozone.scm.client.address: scm-0.scm
- OZONE-SITE.XML_ozone.scm.names: scm-0.scm
OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "3"
OZONE-SITE.XML_ozone.datanode.pipeline.limit: "1"
+ OZONE-SITE.XML_dfs.datanode.use.datanode.hostname: "true"
LOG4J.PROPERTIES_log4j.rootLogger: INFO, stdout
LOG4J.PROPERTIES_log4j.appender.stdout: org.apache.log4j.ConsoleAppender
LOG4J.PROPERTIES_log4j.appender.stdout.layout: org.apache.log4j.PatternLayout
LOG4J.PROPERTIES_log4j.appender.stdout.layout.ConversionPattern:
'%d{yyyy-MM-dd
HH:mm:ss} %-5p %c{1}:%L - %m%n'
+ OZONE-SITE.XML_ozone.scm.service.ids: scmservice
+ OZONE-SITE.XML_ozone.scm.nodes.scmservice: scm0,scm1,scm2
+ OZONE-SITE.XML_ozone.scm.address.scmservice.scm0:
scm-0.scm.default.svc.cluster.local
+ OZONE-SITE.XML_ozone.scm.address.scmservice.scm1:
scm-1.scm.default.svc.cluster.local
+ OZONE-SITE.XML_ozone.scm.address.scmservice.scm2:
scm-2.scm.default.svc.cluster.local
+ OZONE-SITE.XML_ozone.scm.ratis.enable: "true"
+ OZONE-SITE.XML_ozone.scm.primordial.node.id: scm0
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/om-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/om-statefulset.yaml
index ad0b16eaca..335acfa9f9 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/om-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/om-statefulset.yaml
@@ -69,4 +69,4 @@ spec:
- ReadWriteOnce
resources:
requests:
- storage: 2Gi
+ storage: 20Gi
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/s3g-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/s3g-statefulset.yaml
index 6e96fb7dbc..995c5f37d8 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/s3g-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/s3g-statefulset.yaml
@@ -58,4 +58,4 @@ spec:
- ReadWriteOnce
resources:
requests:
- storage: 2Gi
+ storage: 20Gi
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/scm-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/scm-statefulset.yaml
index d4d651349f..a0be3d58ed 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/scm-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/scm-statefulset.yaml
@@ -26,7 +26,7 @@ spec:
app: ozone
component: scm
serviceName: scm
- replicas: 1
+ replicas: 3
template:
metadata:
labels:
@@ -52,6 +52,18 @@ spec:
volumeMounts:
- name: data
mountPath: /data
+ - name: bootstrap
+ image: '@docker.image@'
+ args:
+ - ozone
+ - scm
+ - --bootstrap
+ envFrom:
+ - configMapRef:
+ name: config
+ volumeMounts:
+ - name: data
+ mountPath: /data
containers:
- name: scm
image: '@docker.image@'
@@ -76,4 +88,4 @@ spec:
- ReadWriteOnce
resources:
requests:
- storage: 2Gi
+ storage: 20Gi
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/test.sh
old mode 100644
new mode 100755
similarity index 69%
copy from hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
copy to hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/test.sh
index 445f255028..23d8ad795d
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/Flekszible
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone-ha/test.sh
@@ -1,3 +1,4 @@
+#!/usr/bin/env bash
# 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
@@ -13,21 +14,16 @@
# 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.
-source:
- - path: ../../definitions
-import:
- - path: ozone
- transformations:
- - type: Image
- image: "@docker.image@"
- - type: ozone/persistence
- - path: ozone/freon
- destination: freon
- transformations:
- - type: Image
- image: "@docker.image@"
- - type: kustomize
-transformations:
- - type: Namespace
- - type: kustomize
+set -eu -o pipefail
+
+export K8S_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 &&
pwd )"
+
+cd "$K8S_DIR"
+
+# shellcheck source=/dev/null
+source "../testlib.sh"
+
+pre_run_setup
+
+execute_robot_test scm-0 smoketest/basic/basic.robot
diff --git
a/hadoop-ozone/dist/src/main/k8s/examples/ozone/datanode-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/datanode-statefulset.yaml
index 4d510ba26b..d7599c60d5 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/datanode-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/datanode-statefulset.yaml
@@ -27,7 +27,6 @@ spec:
component: datanode
serviceName: datanode
replicas: 3
- podManagementPolicy: Parallel
template:
metadata:
labels:
@@ -53,7 +52,6 @@ spec:
containers:
- name: datanode
image: '@docker.image@'
- imagePullPolicy: Always
args:
- ozone
- datanode
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/om-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/om-statefulset.yaml
index 84b81dd1bf..335acfa9f9 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/om-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/om-statefulset.yaml
@@ -42,7 +42,6 @@ spec:
containers:
- name: om
image: '@docker.image@'
- imagePullPolicy: Always
args:
- ozone
- om
@@ -70,4 +69,4 @@ spec:
- ReadWriteOnce
resources:
requests:
- storage: 2Gi
+ storage: 20Gi
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/s3g-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/s3g-statefulset.yaml
index 8a17c72c38..995c5f37d8 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/s3g-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/s3g-statefulset.yaml
@@ -36,7 +36,6 @@ spec:
containers:
- name: s3g
image: '@docker.image@'
- imagePullPolicy: Always
args:
- ozone
- s3g
@@ -59,4 +58,4 @@ spec:
- ReadWriteOnce
resources:
requests:
- storage: 2Gi
+ storage: 20Gi
diff --git a/hadoop-ozone/dist/src/main/k8s/examples/ozone/scm-statefulset.yaml
b/hadoop-ozone/dist/src/main/k8s/examples/ozone/scm-statefulset.yaml
index 6efc374d00..0cbca68524 100644
--- a/hadoop-ozone/dist/src/main/k8s/examples/ozone/scm-statefulset.yaml
+++ b/hadoop-ozone/dist/src/main/k8s/examples/ozone/scm-statefulset.yaml
@@ -42,7 +42,6 @@ spec:
initContainers:
- name: init
image: '@docker.image@'
- imagePullPolicy: Always
args:
- ozone
- scm
@@ -56,7 +55,6 @@ spec:
containers:
- name: scm
image: '@docker.image@'
- imagePullPolicy: Always
args:
- ozone
- scm
@@ -78,4 +76,4 @@ spec:
- ReadWriteOnce
resources:
requests:
- storage: 2Gi
+ storage: 20Gi
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
