Merge pull request #54 from ydb-platform/php-version

Php version
ydb-platform · May 17, 2024 · 78fec2f · 78fec2f
2 parents f8e9068 + 86fbb2c
commit 78fec2f
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 34 deletions.
diff --git a/action.yml b/action.yml
@@ -37,6 +37,12 @@ inputs:
   grafana_dashboard:
     description: 'Grafana service dashboard'
     required: true
+  grafana_dashboard_width:
+    description: 'Grafana service screenshot dashboard width'
+    required: false
+  grafana_dashboard_height:
+    description: 'Grafana service screenshot dashboard height'
+    required: false
   ydb_version:
     description: 'YDB version to run SLO over: use docker tag or `newest`'
     required: true

diff --git a/dist/main/index.js b/dist/main/index.js
diff --git a/src/errorScheduler.ts b/src/errorScheduler.ts
@@ -80,7 +80,7 @@ async function createError(
     // run command
     callKubernetesAsync(kubeCommand),
     // annotate
-    annotate(name),
+    annotate(name, core.getInput('grafana_dashboard') || '7CzMl5t4k'),
     // wait till next
     new Promise(resolve => {
       setTimeout(resolve, timeBetweenS * 1000)

diff --git a/src/grafanaScreenshot.ts b/src/grafanaScreenshot.ts
@@ -35,25 +35,25 @@ export async function grafanaScreenshot(
   )
   core.debug('Write picture to FS')
 
-  const pictureName = `${workloadId}-${new Date().valueOf()}.png`
+  const fileName = `${workloadId}-${new Date().valueOf()}.png`
 
   // write image to fs
-  await writeFile(`${pictureName}.png`, Buffer.from(imageb64, 'base64'))
+  await writeFile(fileName, Buffer.from(imageb64, 'base64'))
 
   // upload
   await callAsync(
-    `aws s3 --endpoint-url=${s3Endpoint} cp ./${pictureName}.png "s3://${path.join(
+    `aws s3 --endpoint-url=${s3Endpoint} cp ./${fileName} "s3://${path.join(
       s3Folder,
-      pictureName
+      fileName
     )}"`
   )
 
   // delete
-  await callAsync(`rm ${pictureName}.png`)
+  await callAsync(`rm ${fileName}`)
 
   // return name
   const fullPictureUri =
-    'https://' + path.join(s3Endpoint.split('//')[1], s3Folder, pictureName)
+    'https://' + path.join(s3Endpoint.split('//')[1], s3Folder, fileName)
   core.debug('fullPictureUri: ' + fullPictureUri)
   return `${fullPictureUri}`
 }

diff --git a/src/main.ts b/src/main.ts
@@ -40,7 +40,9 @@ async function main(): Promise<void> {
       timeBetweenPhases,
       shutdownTime,
       grafanaDomain,
-      grafanaDashboard
+      grafanaDashboard,
+      grafanaDashboardWidth,
+      grafanaDashboardHeight
     } = parseArguments()
 
     core.debug(`Setting up OctoKit`)
@@ -217,7 +219,9 @@ async function main(): Promise<void> {
                       workloads[i].id,
                       timings.startTime,
                       timings.endTime,
-                      grafanaDashboard
+                      grafanaDashboard,
+                      grafanaDashboardWidth,
+                      grafanaDashboardHeight
                     )
                     const comment = `
 :volcano: Here are results of SLO test for **${

diff --git a/src/parseArguments.ts b/src/parseArguments.ts
@@ -43,6 +43,12 @@ export function parseArguments() {
     const s3Folder = core.getInput('s3_images_folder')
     const grafanaDomain = core.getInput('grafana_domain')
     const grafanaDashboard = core.getInput('grafana_dashboard') || '7CzMl5t4k'
+    const grafanaDashboardWidth = Number(
+      core.getInput('grafana_dashboard_width') || '1500'
+    )
+    const grafanaDashboardHeight = Number(
+      core.getInput('grafana_dashboard_height') || '1700'
+    )
 
     let ydbVersion = core.getInput('ydb_version')
 
@@ -79,7 +85,9 @@ export function parseArguments() {
       timeBetweenPhases,
       shutdownTime,
       grafanaDomain,
-      grafanaDashboard
+      grafanaDashboard,
+      grafanaDashboardWidth,
+      grafanaDashboardHeight
     }
   })
 }

diff --git a/src/workload.ts b/src/workload.ts
@@ -106,31 +106,34 @@ export function runWorkload(
           kubectl => `${kubectl} apply -f - <<EOF\n${workloadManifest}\nEOF`
         ))
     )
-
-    await withTimeout(
-      options.timeoutMins,
-      15,
-      `Workload ${options.id} ${command}`,
-      async () => {
-        const status = JSON.parse(
-          await callKubernetesAsync(
-            `get job/${options.id}-wl-${command} -o=jsonpath={.status}`
+
+    try {
+      await withTimeout(
+        options.timeoutMins,
+        15,
+        `Workload ${options.id} ${command}`,
+        async () => {
+          const status = JSON.parse(
+            await callKubernetesAsync(
+              `get job/${options.id}-wl-${command} -o=jsonpath={.status}`
+            )
           )
-        )
-        core.debug('Workload status check: ' + JSON.stringify(status))
-        if (status.failed) {
-          const msg = `Workload ${options.id} ${command} failed`
-          core.info(msg)
-          await saveLogs(options.id, command)
-          throw new Error(msg)
+          core.debug('Workload status check: ' + JSON.stringify(status))
+          if (status.failed) {
+            const msg = `Workload ${options.id} ${command} failed`
+            core.info(msg)
+            await saveLogs(options.id, command)
+            throw new Error(msg)
+          }
+          return (status.complete || status.succeeded);
         }
-        return status.complete || status.succeeded
-      }
-    )
-    const endTime = new Date()
-    // print logs
-    await saveLogs(options.id, command)
-    return {startTime, endTime}
+      )
+    } finally {
+      const endTime = new Date()
+      // print logs
+      await saveLogs(options.id, command)
+      return {startTime, endTime}
+    }
   })
 }