CON-250 - stateMachine updates to consume primarySyncFromSecondary (Divergent state recovery #3)

creator-node/src/components/replicaSet/replicaSetController.js

@@ -12,7 +12,7 @@ const {
 } = require('./URSMRegistrationComponentService')
 const { ensureStorageMiddleware } = require('../../middlewares')
 const { enqueueSync } = require('./syncQueueComponentService')
-const processSync = require('../../services/sync/processSync')
+const secondarySyncFromPrimary = require('../../services/sync/secondarySyncFromPrimary')
 
 const router = express.Router()
 
@@ -90,7 +90,7 @@ const syncRouteController = async (req, res) => {
    * Else, debounce + add sync to queue
    */
   if (immediate) {
-    const errorObj = await processSync(
+    const errorObj = await secondarySyncFromPrimary(
       serviceRegistry,
       walletPublicKeys,
       creatorNodeEndpoint,

creator-node/src/dbManager.js

@@ -48,9 +48,11 @@ class DBManager {
     queryObj.clock = selectCNodeUserClockSubqueryLiteral
 
     // Create new Data table entry with queryObj using new CNodeUser.clock
-    const file = await sequelizeTableInstance.create(queryObj, { transaction })
+    const newDataRecord = await sequelizeTableInstance.create(queryObj, {
+      transaction
+    })
 
-    return file.dataValues
+    return newDataRecord.dataValues
   }
 
   /**

creator-node/src/middlewares.js

@@ -89,24 +89,55 @@ async function authMiddleware(req, res, next) {
   next()
 }
 
-/** Ensure resource write access */
-async function syncLockMiddleware(req, res, next) {
+/**
+ * Acquire wallet write lock; return 423 error if already held
+ */
+async function acquireWalletWriteLock(req, res, next) {
+  const redisClient = req.app.get('redisClient')
+
   if (req.session && req.session.wallet) {
-    const redisClient = req.app.get('redisClient')
-    const redisKey = redisClient.getNodeSyncRedisKey(req.session.wallet)
-    const lockHeld = await redisClient.lock.getLock(redisKey)
-    if (lockHeld) {
+    const wallet = req.session.wallet
+
+    try {
+      await redisClient.WalletWriteLock.acquire(
+        wallet,
+        redisClient.WalletWriteLock.VALID_ACQUIRERS.UserWrite
+      )
+    } catch (e) {
       return sendResponse(
         req,
         res,
         errorResponse(
           423,
-          `Cannot change state of wallet ${req.session.wallet}. Node sync currently in progress.`
+          `Cannot change state of wallet ${wallet}. Another write in progress.`
         )
       )
     }
   }
-  req.logger.info(`syncLockMiddleware succeeded`)
+
+  req.logger.debug(`acquireWalletWriteLock succeeded`)
+  next()
+}
+
+/**
+ * Release wallet write lock
+ */
+async function releaseWalletWriteLock(req, res, next) {
+  const redisClient = req.app.get('redisClient')
+
+  if (req.session && req.session.wallet) {
+    const wallet = req.session.wallet
+
+    try {
+      await redisClient.WalletWriteLock.release(wallet)
+    } catch (e) {
+      req.logger.warn(
+        `releaseWalletWriteLock Failure for wallet ${wallet} - ${e.message}`
+      )
+    }
+  }
+
+  req.logger.debug(`acquireWalletWriteLock succeeded`)
   next()
 }
 
@@ -852,7 +883,8 @@ module.exports = {
   ensureStorageMiddleware,
   ensureValidSPMiddleware,
   issueAndWaitForSecondarySyncRequests,
-  syncLockMiddleware,
+  acquireWalletWriteLock,
+  releaseWalletWriteLock,
   getOwnEndpoint,
   getCreatorNodeEndpoints
 }