feat(concurrency): recheck if vocab is loaded after waiting for lock

Author: kojiromike

src/Command/ImportCodesCommand.php

@@ -181,7 +181,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $trackingCodeType = ($codeType === 'SNOMED_RF2') ? 'SNOMED' : $codeType;
             $fileChecksum = $metadata['checksum'] ?: md5_file($filePath);
 
-            if ($this->isAlreadyLoaded($trackingCodeType, $metadata['revision_date'], $metadata['version'], $fileChecksum)) {
+            if ($this->importer->isAlreadyLoaded($trackingCodeType, $metadata['revision_date'], $metadata['version'], $fileChecksum)) {
                 $io->warning("Code package appears to be already loaded (same type, version, revision date, and file checksum)");
                 $io->note("Use --force flag to import anyway, or --dry-run to test without checking");
                 return Command::SUCCESS;
@@ -293,18 +293,5 @@ private function is_absolute_path(string $path): bool
     /**
      * Check if a code package is already loaded with the same metadata
      */
-    private function isAlreadyLoaded(string $codeType, string $revisionDate, string $version, string $fileChecksum): bool
-    {
-        if (!function_exists('sqlQuery')) {
-            return false;
-        }
-
-        $result = sqlQuery(
-            "SELECT COUNT(*) as count FROM `standardized_tables_track` WHERE `name` = ? AND `revision_date` = ? AND `revision_version` = ? AND `file_checksum` = ?",
-            array($codeType, $revisionDate, $version, $fileChecksum)
-        );
-
-        return $result && $result['count'] > 0;
-    }
 
 }

src/Service/CodeImporter.php

@@ -23,6 +23,7 @@ class CodeImporter
     private ?string $currentLockName = null;
     private int $lockRetryAttempts = 10;
     private int $lockRetryDelaySeconds = 30;
+    private bool $waitedForLock = false;
 
     /**
      * Set custom temporary directory
@@ -102,6 +103,12 @@ public function import(string $codeType, bool $isWindows = false, bool $usExtens
         $this->acquireLock($codeType);
 
         try {
+            // If we waited for the lock, check if vocabulary was already imported
+            if ($this->waitedForLock && $this->isVocabularyLoaded($codeType)) {
+                echo "Vocabulary {$codeType} was already imported by another process. Skipping import.\n";
+                return;
+            }
+
             switch ($codeType) {
                 case 'RXNORM':
                     $this->importRxnorm($isWindows);
@@ -228,6 +235,48 @@ private function importValueset(string $type): void
         }
     }
 
+    /**
+     * Check if vocabulary is already loaded by examining standardized_tables_track
+     */
+    public function isAlreadyLoaded(string $codeType, string $revisionDate, string $version, string $fileChecksum): bool
+    {
+        if (!function_exists('sqlQuery')) {
+            return false;
+        }
+
+        $result = sqlQuery(
+            "SELECT COUNT(*) as count FROM `standardized_tables_track` WHERE `name` = ? AND `revision_date` = ? AND `revision_version` = ? AND `file_checksum` = ?",
+            array($codeType, $revisionDate, $version, $fileChecksum)
+        );
+
+        return $result && $result['count'] > 0;
+    }
+
+    /**
+     * Check if any version of vocabulary is loaded (simpler check for post-lock validation)
+     */
+    public function isVocabularyLoaded(string $codeType): bool
+    {
+        if (!function_exists('sqlQuery')) {
+            return false;
+        }
+
+        // Use SNOMED for tracking regardless of RF2 format to match OpenEMR expectations
+        $trackingCodeType = ($codeType === 'SNOMED_RF2') ? 'SNOMED' : $codeType;
+
+        try {
+            $result = sqlQuery(
+                "SELECT COUNT(*) as count FROM standardized_tables_track WHERE name = ?",
+                [$trackingCodeType]
+            );
+
+            return $result && $result['count'] > 0;
+        } catch (\Exception $e) {
+            // If query fails, assume not loaded to be safe
+            return false;
+        }
+    }
+
     /**
      * Update tracking table
      */
@@ -293,6 +342,7 @@ private function acquireLock(string $codeType): void
 
             if ($attempt < $this->lockRetryAttempts) {
                 echo "Lock is held by another process. Waiting {$delay} seconds before retry {$attempt}/{$this->lockRetryAttempts}...\n";
+                $this->waitedForLock = true;
                 sleep($delay);
 
                 // Exponential backoff with jitter (cap at 5 minutes)
@@ -349,6 +399,7 @@ private function releaseLock(): void
             error_log("Warning: Failed to release database lock '{$this->currentLockName}': " . $e->getMessage());
         } finally {
             $this->currentLockName = null;
+            $this->waitedForLock = false;
         }
     }