fix: reduce verbosity of vmap log (#877)

Signed-off-by: Jeffrey Tang <jeffrey@swirldslabs.com>

.github/workflows/zxc-helm-chart-tests.yaml

@@ -57,6 +57,13 @@ jobs:
             sudo apt-get update
             sudo apt-get install -y make
           fi
+
+      - name: Checkout Code
+        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
+        with:
+          # the fetch depth defaults to only the commit that triggered the workflow unless the spotless check was enabled
+          fetch-depth: ${{ inputs.enable-spotless-check && '0' || '' }}
+
       - name: Get changed files related to charts
         id: changed-files
         uses: tj-actions/changed-files@d6babd6899969df1a11d14c368283ea4436bca78 #v44.5.2
@@ -82,7 +89,7 @@ jobs:
             echo " - ${file} was changed"
           done
           echo ""
-          if [ "${{ steps.changed-files.outputs.scripts_any_changed }}" == "true" ] || [ "${{ steps.changed-files.outputs.chart_any_changed }}" == "true"]; then
+          if [[ "${{ steps.changed-files.outputs.scripts_any_changed }}" == "true" || "${{ steps.changed-files.outputs.chart_any_changed }}" == "true" ]]; then
             echo "run-tests=true" >> "${GITHUB_OUTPUT}"
             echo "Executing helm chart tests...."
           else
@@ -95,13 +102,6 @@ jobs:
         run: |
           echo "script_name=${{ matrix.scriptName }}" >> "${GITHUB_OUTPUT}"
 
-      - name: Checkout Code
-        uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6
-        if: ${{ steps.check-changed-files.outputs.run-tests && !cancelled() && !failure() }}
-        with:
-          # the fetch depth defaults to only the commit that triggered the workflow unless the spotless check was enabled
-          fetch-depth: ${{ inputs.enable-spotless-check && '0' || '' }}
-
       - name: Install wget
         run: |
           sudo apt-get update

charts/fullstack-deployment/templates/network-node-statefulset.yaml

@@ -146,24 +146,8 @@ spec:
         startupProbe:
           exec:
             command:
-              - sh
-              - -c
-              - |
-                jshell --version &>/dev/null
-                cat << EOF | jshell /dev/stdin
-                int rc = 1;
-                try {
-                  final String serviceName = "network-{{ $node.name }}";
-                  final String namespace = "{{ default $.Release.Namespace $.Values.global.namespaceOverride }}";
-                  final String clusterDomain = "cluster.local";
-                  final String fqdn = String.join(".", serviceName, namespace, "svc", clusterDomain);
-                  final InetAddress serviceAddress = InetAddress.getByName(fqdn);
-                  rc = 0;
-                } catch (Exception exception) {
-                  System.out.println(exception);
-                }
-                /exit rc
-                EOF
+              - curl
+              - network-{{ $node.name }}-0.network-{{ $node.name }}.{{ default $.Release.Namespace $.Values.global.namespaceOverride }}.svc.cluster.local:13133
           failureThreshold: 30
           periodSeconds: 10
           timeoutSeconds: 5

dev/Makefile

@@ -107,11 +107,22 @@ destroy-network: destroy-test-container uninstall-chart
 
 .PHONY: setup-nodes
 setup-nodes: setup
+ifeq (${SCRIPT_NAME},nmt-install.sh)
+	echo "Ignore error from nmt install due to error of removing symlink"
+	source "${SCRIPTS_DIR}/${SCRIPT_NAME}" && setup_node_all || true
+else
 	source "${SCRIPTS_DIR}/${SCRIPT_NAME}" && setup_node_all
+endif
+
 
 .PHONY: start-nodes
 start-nodes:
+ifeq (${SCRIPT_NAME},nmt-install.sh)
+	echo "Ignore error from nmt install due to error of removing symlink"
+	source "${SCRIPTS_DIR}/${SCRIPT_NAME}" && start_node_all || true
+else
 	source "${SCRIPTS_DIR}/${SCRIPT_NAME}" && start_node_all
+endif
 
 .PHONY: verify-nodes
 verify-nodes:

dev/local-node/log4j2-jrs.xml

@@ -71,7 +71,6 @@
         <Filters>
           <!-- JasperDB & Virtual Merkle -->
           <MarkerFilter marker="JASPER_DB"              onMatch="ACCEPT" onMismatch="NEUTRAL"/>
-          <MarkerFilter marker="VIRTUAL_MERKLE_STATS"   onMatch="ACCEPT" onMismatch="NEUTRAL"/>
           <MarkerFilter marker="DISABLED"               onMatch="DENY"   onMismatch="DENY" />
         </Filters>
       </AppenderRef>

dev/scripts/env.sh

@@ -115,7 +115,7 @@ POD_MONITOR_ROLE="${POD_MONITOR_ROLE:-pod-monitor-role}"
 GATEWAY_CLASS_NAME="${GATEWAY_CLASS_NAME:-fst-gateway-class}"
 
 #NODE_NAMES=(node0 node1 node2 node3)
-NODE_NAMES=(node0)
+NODE_NAMES=(node0,node1,node2)
 
 POD_MONITOR_ROLE="${POD_MONITOR_ROLE:-pod-monitor-role}"
 GATEWAY_CLASS_NAME="${GATEWAY_CLASS_NAME:-fst-gateway-class}"

dev/scripts/helper.sh

@@ -34,7 +34,7 @@ readonly PLATFORM_INSTALLER_DIR="${SCRIPT_DIR}/../resources/platform"
 readonly PLATFORM_INSTALLER_PATH="${PLATFORM_INSTALLER_DIR}/${PLATFORM_INSTALLER}"
 readonly PLATFORM_INSTALLER_URL=$(prepare_platform_software_URL "${PLATFORM_VERSION}")
 
-readonly OPENJDK_VERSION="${OPENJDK_VERSION:-17.0.2}"
+readonly OPENJDK_VERSION="${OPENJDK_VERSION:-21.0.1}"
 
 function log_time() {
   local end_time duration execution_time
@@ -495,7 +495,8 @@ function install_nmt() {
     return "${EX_ERR}"
   fi
 
-  cleanup_path "${pod}" "${HGCAPP_DIR}/*" || return "${EX_ERR}"
+  # do not call rm directoires for nmt install
+  # cleanup_path "${pod}" "${HGCAPP_DIR}/*" || return "${EX_ERR}"
   "${KCTL}" exec "${pod}" -c root-container -- chmod +x "${HEDERA_HOME_DIR}/${NMT_INSTALLER}" || return "${EX_ERR}"
   "${KCTL}" exec "${pod}" -c root-container -- sudo "${HEDERA_HOME_DIR}/${NMT_INSTALLER}" --accept -- -fg || return "${EX_ERR}"
 

dev/scripts/main.sh

@@ -120,9 +120,9 @@ function uninstall_chart() {
 
   # it is needed for GKE deployment
   local has_secret
-  has_secret=$(kubectl get secret | grep -c "sh.helm.release.v1.${RELEASE_NAME}.*")
+  has_secret=$(kubectl get secret | grep -c "sh.helm.release.v1.fullstack-cluster-setup.*")
   if [[ $has_secret ]]; then
-    kubectl delete secret "sh.helm.release.v1.${RELEASE_NAME}.v1" || true
+    kubectl delete secret "sh.helm.release.v1.fullstack-cluster-setup.v1" || true
   fi
 
   local has_postgres_pvc

dev/scripts/template.env

@@ -2,8 +2,8 @@ USER="${USER:-changeme}"
 CLUSTER_NAME="${CLUSTER_NAME:-fst}"
 NAMESPACE="${NAMESPACE:-fst-${USER}}"
 RELEASE_NAME="${RELEASE_NAME:-fst}"
-NMT_VERSION=v1.2.2
-PLATFORM_VERSION=v0.42.5
+NMT_VERSION=v1.2.4
+PLATFORM_VERSION=v0.49.0-alpha.2
 
 POD_MONITOR_ROLE="${POD_MONITOR_ROLE:-pod-monitor-role}"
 GATEWAY_CLASS_NAME="${GATEWAY_CLASS_NAME:-fst-gateway-class}"