Merge commit 'c8398c93263bb470094dba10223763093b60ea98' into develop

pengzhouml · pengzhouml · commit 7bbf774d2903 · 2022-08-16T22:51:01.000-07:00
* commit 'c8398c93263bb470094dba10223763093b60ea98':
  CLD-479: Adding ML Host changes commit
  Fix package issue
  Update makefile
  Seperate tests into catagorys instead of all being in one file
  Update e2e tests to create a seperate namespace for each test
  CLD-515: Add aditional test cases
  CLD-488: Move MARKLOGIC_INIT to configmap.yaml and add MARKLOGIC_JOIN_CLUSTER to add functionality requested in sprint review meeting
  Remove replica count and shell command
  Make naming conventions consistent
  Changes based on PR comments
  Remove direct call of start-marklogic.sh as it is the entry point of the docker image already.
  CLD-488: Update Helm Chart to use docker image scripts
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,2 @@
+.vscode
+values.yaml
diff --git a/charts/templates/configmap.yaml b/charts/templates/configmap.yaml
@@ -6,6 +6,7 @@ metadata:
   labels:
     {{- include "marklogic.labels" . | nindent 4 }}
 data:
-  ML_BOOTSTRAP_HOST: {{ include "marklogic.fullname" . }}-0
-  ML_FQDN_SUFFIX: {{ include "marklogic.headlessURL" . }}
-  
+  MARKLOGIC_BOOTSTRAP_HOST: {{ include "marklogic.fullname" . }}-0
+  MARKLOGIC_FQDN_SUFFIX: {{ include "marklogic.headlessURL" . }}
+  MARKLOGIC_INIT: "true"
+  MARKLOGIC_JOIN_CLUSTER: "true"
diff --git a/charts/templates/statefulset.yaml b/charts/templates/statefulset.yaml
@@ -17,6 +17,10 @@ spec:
         {{- include "marklogic.selectorLabels" . | nindent 8 }}
     spec:
       serviceAccountName: {{ include "marklogic.serviceAccountName" . }}
+      {{- with .Values.affinity }}
+      affinity: {{- toYaml . | nindent 8}}
+      {{- end }}
+      terminationGracePeriodSeconds: {{ .Values.terminationGracePeriod }}
       containers:
         - name: marklogic-server
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
@@ -28,83 +32,19 @@ spec:
               {{- toYaml .Values.extraVolumeMounts | nindent 12 }}
             {{- end }}
           env:
-            - name: ML_ADMIN_USER
+            - name: MARKLOGIC_ADMIN_USERNAME
               valueFrom:
                 secretKeyRef:
                   name: {{ include "marklogic.fullname" . }}
                   key: username
-            - name: ML_ADMIN_PASS
+            - name: MARKLOGIC_ADMIN_PASSWORD
               valueFrom:
                   secretKeyRef:
                     name: {{ include "marklogic.fullname" . }}
                     key: password
           envFrom:
             - configMapRef:
                 name: {{ include "marklogic.fullname" . }}
-          command:
-            - bash
-            - '-c'
-            - |
-              echo '### Begin ML Container Config ###'
-
-              # Set Hostname to the value of hostname command to /etc/marklogic.conf
-              HOST_FQDN="$(hostname).$ML_FQDN_SUFFIX"
-              echo "export MARKLOGIC_HOSTNAME=\"$HOST_FQDN\"" | sudo tee /etc/marklogic.conf
-
-              cd ~
-
-              AUTH_CURL="curl --anyauth --user $ML_ADMIN_USER:$ML_ADMIN_PASS -m 20 -s "
-
-              # Start MarkLogic
-              sudo service MarkLogic start
-              sleep 5s
-
-              # Initialize and Setup Admin User
-              echo '### Initialize and Setup Admin User ###'
-              ML_STATUS_CODE=`curl -s -o /dev/null --write-out %{response_code}  http://localhost:8001/admin/v1/init`
-              if [ "$ML_STATUS_CODE" == "401" ]; then
-                echo "Server is already configured." 
-              else
-                curl -X POST -d "" http://$HOSTNAME:8001/admin/v1/init
-                sleep 5s
-
-                curl -X POST -H "Content-type: application/x-www-form-urlencoded" \
-                    --data "admin-username=$ML_ADMIN_USER" --data "admin-password=$ML_ADMIN_PASS" \
-                    --data "realm=public" \
-                    http://$HOSTNAME:8001/admin/v1/instance-admin
-                sleep 10s
-
-                # for EA1 release, disable turning on XDQP by default.
-                # Turn on XDQP encryption via CMA
-                # $AUTH_CURL -X POST -H 'Content-Type: application/json' \
-                #     -d '{"config":[{"op":"update","group":[{"group-name":"Default","xdqp-ssl-enabled":true}]}]}' \
-                #     http://$HOSTNAME:8002/manage/v3/
-
-                # Join Cluster
-                if [ "$HOSTNAME" != "$ML_BOOTSTRAP_HOST" ]; then
-                  echo "### joining cluster ###"
-                  joiner=$HOSTNAME
-                  cluster="$ML_BOOTSTRAP_HOST"
-                  $AUTH_CURL -o host.xml -X GET -H "Accept: application/xml" http://${joiner}:8001/admin/v1/server-config
-                  $AUTH_CURL -X POST -d "group=Default" --data-urlencode "server-config@./host.xml" -H "Content-type: application/x-www-form-urlencoded" -o cluster.zip http://${cluster}:8001/admin/v1/cluster-config
-
-                  sleep 10s
-
-                  $AUTH_CURL -X POST -H "Content-type: application/zip" --data-binary @./cluster.zip http://${joiner}:8001/admin/v1/cluster-config 
-                  sleep 5s
-
-                  rm -f host.xml
-                  rm -f cluster.zip
-                fi
-
-              fi
-
-              # mark the pod ready for readiness probe
-              sudo touch /var/opt/MarkLogic/ready
-
-              echo '### END ML Container Config ###'
-
-              tail -f $MARKLOGIC_DATA_DIR/Logs/ErrorLog.txt
           ports:
             - containerPort: 7997
               name: health-check
@@ -121,6 +61,53 @@ spec:
             {{- if .Values.extraContainerPorts }}
               {{- toYaml .Values.extraContainerPorts | nindent 12 }}
             {{- end }}
+          lifecycle:
+            preStop:
+              exec:
+                command:
+                  - bash
+                  - '-c'
+                  - |
+                    log () {
+                      local TIMESTAMP=$(date +"%Y-%m-%d %T.%3N")
+                      echo "${TIMESTAMP} $@" > /proc/$pid/fd/1
+                    }
+
+                    pid=$(ps aux | grep -i '/bin/bas[h] /usr' | awk {'print $2'})
+                    log "Info: [prestop] Prestop Hook Execution"
+
+                    my_host=$(hostname -f)
+
+                    log "Info: [prestop] MarkLogic Pod Hostname: "$my_host
+
+                    for ((i = 0; i < 5; i = i + 1)); do
+                        res_code=$(curl --anyauth --user $MARKLOGIC_ADMIN_USERNAME:$MARKLOGIC_ADMIN_PASSWORD \
+                            -o /dev/null -m 10 -s -w %{http_code} \
+                            -i -X POST --data "state=shutdown&failover=true" \
+                            -H "Content-type: application/x-www-form-urlencoded" \
+                            http://localhost:8002/manage/v2/hosts/$my_host?format=json)
+
+                        if [[ ${res_code} -eq 202 ]]; then
+                            log "Info: [prestop] Host shut down response code: "$res_code
+
+                            while (true)
+                            do
+                               ml_status=$(service MarkLogic status)
+                               log "Info: [prestop] MarkLogic Status: "$ml_status
+                               if [[ "$ml_status" =~ "running" ]]; then
+                                  sleep 5s
+                                  continue
+                               else
+                                  break
+                               fi
+                            done
+                            break
+                        else
+                            log "ERROR: [prestop] Retry Attempt: "$i
+                            log "ERROR: [prestop] Host shut down expected response code 202, got "$res_code
+                            sleep 10s
+                        fi
+                    done
           {{- if .Values.livenessProbe.enabled }}
           livenessProbe:
             httpGet:
@@ -157,9 +144,6 @@ spec:
           {{- with .Values.resources }}
           resources: {{- toYaml . | nindent 12 }}
           {{- end }}
-      {{- with .Values.affinity }}
-      affinity: {{- toYaml . | nindent 8}}
-      {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector: {{- toYaml . | nindent 8}}
       {{- end }}
diff --git a/charts/values.yaml b/charts/values.yaml
@@ -3,6 +3,9 @@
 # Number of Marklogic nodes
 replicaCount: 1
 
+# Termination Grace Period
+terminationGracePeriod: 120
+
 # Marklogic image parameters
 image:
   repository: marklogicdb/marklogic-db
diff --git a/go.mod b/go.mod
@@ -5,6 +5,7 @@ go 1.17
 require (
 	github.com/gruntwork-io/terratest v0.40.6
 	github.com/stretchr/testify v1.7.0
+	github.com/xinsnake/go-http-digest-auth-client v0.6.0
 	k8s.io/api v0.23.0
 )
 
diff --git a/go.sum b/go.sum
@@ -783,6 +783,8 @@ github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2
 github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
 github.com/xeipuuv/gojsonschema v0.0.0-20180618132009-1d523034197f/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
+github.com/xinsnake/go-http-digest-auth-client v0.6.0 h1:nrYFWDrB2F7VwYlNravXZS0nOtg9axlATH3Jns55/F0=
+github.com/xinsnake/go-http-digest-auth-client v0.6.0/go.mod h1:QK1t1v7ylyGb363vGWu+6Irh7gyFj+N7+UZzM0L6g8I=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
diff --git a/makefile b/makefile
@@ -6,4 +6,6 @@ test/e2e: install-go-modules
 	sh ./test/e2e/e2e.sh
 
 test/template: install-go-modules
-	go test -v ./test/template/...
+	go test -v ./test/template/...
+
+test: test/template test/e2e
diff --git a/test/e2e/clustering_test.go b/test/e2e/clustering_test.go
@@ -0,0 +1,80 @@
+package e2e
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"path/filepath"
+	"strings"
+	"testing"
+	"time"
+
+	"github.com/gruntwork-io/terratest/modules/helm"
+	"github.com/gruntwork-io/terratest/modules/k8s"
+	"github.com/gruntwork-io/terratest/modules/random"
+	digest_auth "github.com/xinsnake/go-http-digest-auth-client"
+)
+
+
+func TestClusterJoin(t *testing.T) {
+	// Path to the helm chart we will test 
+	helmChartPath, e := filepath.Abs("../../charts")
+	if (e != nil) {
+		t.Fatalf(e.Error())
+	}
+	username := "admin"
+	password := "admin"
+	var resp *http.Response
+	var body []byte
+	var err error
+	namespaceName := "marklogic-" + strings.ToLower(random.UniqueId())
+	kubectlOptions := k8s.NewKubectlOptions("", "", namespaceName)
+	options := &helm.Options{
+		KubectlOptions: kubectlOptions,
+		SetValues: map[string]string{
+			"persistence.enabled": "false",
+			"replicaCount":        "2",
+			"image.repository":    "marklogic-centos/marklogic-server-centos",
+			"image.tag":           "10-internal",
+			"auth.adminUsername":  username,
+			"auth.adminPassword":  password,
+		},
+	}
+
+	t.Logf("====Creating namespace: " + namespaceName)
+	k8s.CreateNamespace(t, kubectlOptions, namespaceName)
+
+	defer t.Logf("====Deleting namespace: " + namespaceName)
+	defer k8s.DeleteNamespace(t, kubectlOptions, namespaceName)
+	
+	t.Logf("====Installing Helm Chart")
+	releaseName := "test-join"
+	helm.Install(t, options, helmChartPath, releaseName)
+
+	podName := releaseName + "-marklogic-1"
+
+	// wait until the pod is in Ready status
+	k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 20*time.Second)
+	tunnel := k8s.NewTunnel(
+		kubectlOptions, k8s.ResourceTypePod, podName, 8002, 8002)
+	defer tunnel.Close()
+	tunnel.ForwardPort(t)
+	endpoint := fmt.Sprintf("http://%s/manage/v2/hosts", tunnel.Endpoint())
+	t.Logf(`Endpoint: %s`, endpoint)
+
+	dr := digest_auth.NewRequest(username, password, "GET", endpoint, "")
+
+	if resp, err = dr.Execute(); err != nil {
+		t.Fatalf(err.Error())
+	}
+	defer resp.Body.Close()
+
+	if body, err = ioutil.ReadAll(resp.Body); err != nil {
+		t.Fatalf(err.Error())
+	}
+
+	t.Logf("Response:\n" + string(body))
+	if !strings.Contains(string(body), "<list-count units=\"quantity\">2</list-count>") {
+		t.Errorf("Wrong number of hosts")
+	}
+}
diff --git a/test/e2e/e2e.sh b/test/e2e/e2e.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
-echo "=====Delete minikube cluster"
-minikube delete
-
 echo "=====Installing minikube cluster"
 minikube start --driver=docker -n=1
 
 echo "=====Loading marklogc images to minikube cluster"
-minikube image load marklogicdb/marklogic-db:10.0-9.1-centos-1.0.0-ea4
+minikube image load marklogicdb/marklogic-db:latest
 
 echo "=====Running tests"
 go test -v -count=1 ./test/e2e/...
+
+echo "=====Delete minikube cluster"
+minikube delete
diff --git a/test/e2e/install_test.go b/test/e2e/install_test.go
@@ -12,39 +12,40 @@ import (
 	http_helper "github.com/gruntwork-io/terratest/modules/http-helper"
 	"github.com/gruntwork-io/terratest/modules/k8s"
 	"github.com/gruntwork-io/terratest/modules/random"
-	"github.com/stretchr/testify/require"
 )
 
 func TestHelmInstall(t *testing.T) {
 	// Path to the helm chart we will test
-	helmChartPath, err := filepath.Abs("../../charts")
-	releaseName := "marklogic-test"
-	t.Log(helmChartPath, releaseName)
-	require.NoError(t, err)
+	helmChartPath, e := filepath.Abs("../../charts")
+	if e != nil {
+		t.Fatalf(e.Error())
+	}
 	namespaceName := "marklogic-" + strings.ToLower(random.UniqueId())
-	t.Logf("creating namespace: %s", namespaceName)
 	kubectlOptions := k8s.NewKubectlOptions("", "", namespaceName)
-
-	// create a new namespace for testing
-	k8s.CreateNamespace(t, kubectlOptions, namespaceName)
-
-	defer k8s.DeleteNamespace(t, kubectlOptions, namespaceName)
 	options := &helm.Options{
 		KubectlOptions: kubectlOptions,
 		SetValues: map[string]string{
 			"persistence.enabled": "false",
+			"replicaCount":        "1",
+			"image.repository":    "marklogic-centos/marklogic-server-centos",
+			"image.tag":           "10-internal",
 		},
 	}
 
-	defer helm.Delete(t, options, releaseName, true)
+	t.Logf("====Creating namespace: " + namespaceName)
+	k8s.CreateNamespace(t, kubectlOptions, namespaceName)
+
+	defer t.Logf("====Deleting namespace: " + namespaceName)
+	defer k8s.DeleteNamespace(t, kubectlOptions, namespaceName)
 
-	//install Helm Chart for testing
+	t.Logf("====Installing Helm Chart")
+	releaseName := "test-install"
 	helm.Install(t, options, helmChartPath, releaseName)
 
 	tlsConfig := tls.Config{}
-	podName := "marklogic-test-0"
+	podName := releaseName + "-marklogic-0"
 	// wait until the pod is in Ready status
-	k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 10*time.Second)
+	k8s.WaitUntilPodAvailable(t, kubectlOptions, podName, 10, 15*time.Second)
 	tunnel := k8s.NewTunnel(
 		kubectlOptions, k8s.ResourceTypePod, podName, 7997, 7997)
 	defer tunnel.Close()
diff --git a/test/e2e/upgrade_test.go b/test/e2e/upgrade_test.go

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ go 1.17`
`5`	`5`	`require (`
`6`	`6`	`github.com/gruntwork-io/terratest v0.40.6`
`7`	`7`	`github.com/stretchr/testify v1.7.0`
	`8`	`+ github.com/xinsnake/go-http-digest-auth-client v0.6.0`
`8`	`9`	`k8s.io/api v0.23.0`
`9`	`10`	`)`
`10`	`11`