UBERF-8044: staging model version (#6492)

Signed-off-by: Alexey Zinoviev <alexey.zinoviev@xored.com>

.github/workflows/main.yml

@@ -40,6 +40,7 @@ env:
     .prettierrc
     tools
   PublishTempFolder: publish_artifacts
+  MODEL_VERSION_MODE: ${{ startsWith(github.ref, 'refs/tags/s') && 'tagTime' || 'file' }}
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:

common/scripts/show_version.js

@@ -15,12 +15,40 @@
 
 const fs = require('fs')
 const path = require('path')
+const exec = require('child_process').exec
 
-try {
+function main (mode) {
-  const versionFilePath = path.resolve(__dirname, 'version.txt')
+  exec('git describe --tags --abbrev=0', (err, stdout) => {
-  const version = fs.readFileSync(versionFilePath, 'utf8').trim()
+    if (err !== null) {
-  
+      console.log('"0.7.0"')
-  console.log(version)
+      return
-} catch (error) {
+    }
-  console.log('0.6.0')
+
+    const tag = stdout.trim()
+
+    if (mode === 'tagTime') {
+      // Take tagged git commit date as model version
+      exec(`git for-each-ref --shell --format="%(creatordate:format:%s)" "refs/tags/${tag}"`, (err, stdout) => {
+        console.log(`"0.7.${err === null ? stdout.trim().slice(1, -1) : 0}"`)
+      })
+    } else {
+      // Take version from file
+      let version
+      try {
+        const versionFilePath = path.resolve(__dirname, 'version.txt')
+        version = fs.readFileSync(versionFilePath, 'utf8').trim()
+      } catch (error) {
+        version = '"0.6.0"'
+      }
+
+      console.log(version)
+    }
+  })
 }
+
+let mode = process.env.MODEL_VERSION_MODE
+if (mode !== 'tagTime') {
+  mode = 'file'
+}
+
+main(mode)

server/account/src/operations.ts

@@ -1480,22 +1480,20 @@ export async function getPendingWorkspace (
           ? pendingUpgradeQuery
           : [...pendingCreationQuery, ...pendingUpgradeQuery]
   }
-  let query: Filter<Workspace>
+  const attemptsQuery = { $or: [{ attempts: { $exists: false } }, { attempts: { $lte: 3 } }] }
 
-  if (region !== '') {
+  // We must have all the conditions in the DB query and we cannot filter anything in the code
-    query = {
+  // because of possible concurrency between account services. We have to update "lastProcessingTime"
-      ...operationQuery,
+  // at the time of retrieval and not after some additional processing.
-      region
+  const query: Filter<Workspace> = {
-    }
+    $and: [
-  } else {
+      operationQuery,
-    query = {
+      attemptsQuery,
-      $and: [operationQuery, defaultRegionQuery]
+      region !== '' ? { region } : defaultRegionQuery,
-    }
+      { lastProcessingTime: { $lt: Date.now() - processingTimeoutMs } }
+    ]
   }
 
-  query.lastProcessingTime = { $lt: Date.now() - processingTimeoutMs }
-  query.attempts = { $lte: 3 }
-
   return (
     (await wsCollection.findOneAndUpdate(
       query,