working version with dump saved state

Signed-off-by: Jeromy Cannon <[email protected]>

Author: jeromy-cannon

src/commands/node.mjs

@@ -938,6 +938,29 @@ export class NodeCommand extends BaseCommand {
         title: 'Identify network pods',
         task: (ctx, task) => self.taskCheckNetworkNodePods(ctx, task)
       },
+      {
+        title: 'Dump network nodes saved state',
+        task:
+            async (ctx, task) => {
+              const subTasks = []
+              for (const nodeId of ctx.config.nodeIds) {
+                const podName = ctx.config.podNames[nodeId]
+                subTasks.push({
+                  title: `Node: ${chalk.yellow(nodeId)}`,
+                  task: async () =>
+                    await self.k8.execContainer(podName, constants.ROOT_CONTAINER, ['bash', '-c', `rm -rf ${constants.HEDERA_HAPI_PATH}/data/saved/*`])
+                })
+              }
+
+              // set up the sub-tasks
+              return task.newListr(subTasks, {
+                concurrent: true, // since we download in the container directly, we want this to be in parallel across all nodes
+                rendererOptions: {
+                  collapseSubtasks: false
+                }
+              })
+            }
+      },
       { // TODO DRY
         title: 'Fetch platform software into network nodes',
         task:
@@ -1030,6 +1053,26 @@ export class NodeCommand extends BaseCommand {
           })
         }
       },
+      {
+        title: 'Check nodes are ACTIVE',
+        task: (ctx, task) => {
+          const subTasks = []
+          for (const nodeId of ctx.config.nodeIds) {
+            subTasks.push({
+              title: `Check node: ${chalk.yellow(nodeId)}`,
+              task: () => self.checkNetworkNodeStarted(nodeId)
+            })
+          }
+
+          // set up the sub-tasks
+          return task.newListr(subTasks, {
+            concurrent: false,
+            rendererOptions: {
+              collapseSubtasks: false
+            }
+          })
+        }
+      },
       {
         title: 'Check node proxies are ACTIVE',
         // this is more reliable than checking the nodes logs for ACTIVE, as the

test/e2e/commands/node.test.mjs

@@ -58,7 +58,7 @@ describe.each([
     await accountManager.close()
   })
 
-  describe(`Node should start successfully [release ${input.releaseTag}, keyFormat: ${input.keyFormat}]`, () => {
+  describe.skip(`Node should start successfully [release ${input.releaseTag}, keyFormat: ${input.keyFormat}]`, () => {
     it('Balance query should succeed', async () => {
       expect.assertions(2)
 
@@ -115,7 +115,7 @@ describe.each([
     }, 20000)
   })
 
-  describe(`Killed node should refresh successfully [release ${input.releaseTag}, keyFormat: ${input.keyFormat}]`, () => {
+  describe.skip(`Killed node should refresh successfully [release ${input.releaseTag}, keyFormat: ${input.keyFormat}]`, () => {
     let podName = ''
     beforeAll(async () => {
       argv[flags.nodeIDs.name] = 'node0'
@@ -201,18 +201,15 @@ describe.each([
 
   describe(`Stopped node should refresh successfully [release ${input.releaseTag}, keyFormat: ${input.keyFormat}]`, () => {
     let podName = ''
+
     beforeAll(async () => {
       argv[flags.nodeIDs.name] = 'node0'
       const configManager = getTestConfigManager(`${testName}-solo.config`)
       configManager.update(argv, true)
-
       const podArray = await k8.getPodsByLabel(['app=network-node0', 'fullstack.hedera.com/type=network-node'])
 
       if (podArray.length > 0) {
         podName = podArray[0].metadata.name
-        const resp = await k8.kubeClient.deleteNamespacedPod(podName, namespace)
-        expect(resp.response.statusCode).toEqual(200)
-        await sleep(20000) // sleep to wait for pod to finish terminating
       } else {
         throw new Error('pod for node0 not found')
       }
@@ -232,6 +229,7 @@ describe.each([
 
     it('Node0 should not be ACTIVE', async () => {
       expect(3)
+      await expect(nodeCmd.stop(argv)).resolves.toBeTruthy()
       expect(podName).toContain('node0')
       try {
         await expect(nodeCmd.checkNetworkNodeStarted('node0', 5)).rejects.toThrowError()

test/test_util.js

@@ -14,7 +14,7 @@
  * limitations under the License.
  *
  */
-import { describe, expect, it } from '@jest/globals'
+import { beforeAll, describe, expect, it } from '@jest/globals'
 import fs from 'fs'
 import os from 'os'
 import path from 'path'
@@ -186,6 +186,11 @@ export function bootstrapNetwork (testName, argv,
         }
       }
 
+      const pvcs = await k8.listPvcsByNamespace(namespace)
+      for (const pvc of pvcs) {
+        await k8.deletePvc(pvc, namespace)
+      }
+
       if (!await chartManager.isChartInstalled(constants.FULLSTACK_SETUP_NAMESPACE, constants.FULLSTACK_CLUSTER_SETUP_CHART)) {
         await clusterCmd.setup(argv)
       }