Merge pull request #3004 from irontec/PROVIDER-2326-fix-recordings-premature-deletion

[PROVIDER-2326] Fix recordings premature deletion

Author: cruzccl

library/composer-packages/irontec/ivoz-provider-bundle/Resources/config/parameters.yml

@@ -19,7 +19,8 @@ parameters:
     ami_password: ivozamisecret
     ami_port: 5038
     local_storage_path: /opt/irontec/ivozprovider/storage
-    raw_recordings_dir: /opt/irontec/ivozprovider/storage/ivozprovider_model_recordings.originalfile/
+    raw_recordings_dir: '%local_storage_path%/ivozprovider_model_recordings.originalfile/'
+    incoming_recordings_dir: '%local_storage_path%/ivozprovider_model_recordings.spool/'
     default_prov_template_path: /opt/irontec/ivozprovider/microservices/provision/templates/
     sentinels:
         - { host: 'cache.ivozprovider.local', port: '26379' }

library/composer-packages/irontec/ivoz-provider-bundle/composer.json

@@ -1,6 +1,6 @@
 {
     "name": "irontec/ivoz-provider-bundle",
-    "version": "3.2",
+    "version": "3.3",
     "type": "symfony-bundle",
     "description": "Symfony bridge for IvozProvider",
     "license": "GPL-3.0-or-later",

library/composer.json

@@ -88,7 +88,7 @@
         "irontec/ivoz-api-bundle": "^5.0",
         "irontec/ivoz-core": "^5.0",
         "irontec/ivoz-dev-tools": "^6.1.1",
-        "irontec/ivoz-provider-bundle": "^3.2",
+        "irontec/ivoz-provider-bundle": "^3.3",
         "irontec/prophecy": "^1.13",
         "irontec/replacements": "^1.0",
         "irontec/wkhtmltopdf-amd64": "0.12.6.1",

library/composer.lock

@@ -42,7 +42,7 @@ services:
 
     Service\RecordingEndedChecker:
         arguments:
-            $recorderCmd: '/^rtpengine-rec/'
+            $recorderIncomingPath: '%incoming_recordings_dir%'
 
     # add more service definitions when explicit configuration is needed
     # please note that last definitions always *replace* previous ones
@@ -61,4 +61,4 @@ when@test:
         Service\RecordingEndedChecker:
             public: true
             arguments:
-                $recorderCmd: 'php'
+                $recorderIncomingPath: '/tmp'

microservices/recordings/config/services.yaml

@@ -349,7 +349,7 @@ private function isProcessableFile(RawRecordingInfo $rawRecordingInfo): bool
     {
         $isRecordingEnded = $this
             ->recordingEndedChecker
-            ->execute($rawRecordingInfo->getFullName());
+            ->execute($rawRecordingInfo->getFileName());
 
         if (!$isRecordingEnded) {
             $this->logger->info(sprintf(

microservices/recordings/src/Service/Encoder.php

@@ -5,78 +5,28 @@
 class RecordingEndedChecker
 {
     public function __construct(
-        private string $recorderCmd,
+        private string $recorderIncomingPath,
     ) {
     }
 
-    public function execute(string $fullFilename): bool
+    public function execute(string $fileName): bool
     {
-        if (!file_exists($fullFilename)) {
-            throw new \RuntimeException(
-                'File not found: ' . $fullFilename,
-                404
-            );
-        }
-
-        $results = $this->lsof($fullFilename);
-
-        if (empty($results)) {
-            return true;
-        }
-
-        foreach ($results as $result) {
-            $isWriting = $result['mode'] === 'w' || $result['mode'] === 'u';
-            if ($isWriting) {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    /**
-     * @return array<array{'pid': string,'mode': string}>
-     */
-    private function lsof(string $fullFilename): array
-    {
-        $columnCount = 2;
-        $command = sprintf(
-            'lsof -F a -a -c %s %s 2>/dev/null',
-            $this->recorderCmd,
-            $fullFilename,
+        $incomingFileName = str_replace(
+            '-mix.wav',
+            '.meta',
+            $fileName
         );
 
-        /**
-         * @var array<string> $lsofOutput
-         */
-        $lsofOutput = [];
-        $statusCode = -1;
-        exec(
-            $command,
-            $lsofOutput,
-            $statusCode
+        $fp = sprintf(
+            '%s/%s',
+            $this->recorderIncomingPath,
+            $incomingFileName,
         );
 
-        $cmdNotFound = $statusCode === 127;
-
-        if ($cmdNotFound) {
-            throw new \RuntimeException(
-                'Error executing lsof command',
-                500
-            );
-        }
-
-        $noMatchFound = $statusCode !== 0;
-        if ($noMatchFound) {
-            return [];
-        }
-
-        return array_map(
-            fn(array $line) => [
-                'pid' => substr((string)$line[0], 1),
-                'mode' => substr((string)$line[1], 1),
-            ],
-            array_chunk($lsofOutput, $columnCount),
+        $fileExists = file_exists(
+            $fp,
         );
+
+        return !$fileExists;
     }
 }

microservices/recordings/src/Service/RecordingEndedChecker.php

@@ -155,7 +155,7 @@ private function setUpMockRecordingEndedChecker(): void
         $mockRecordingEndedChecker->expects($this->exactly(5))
             ->method('execute')
             ->willReturnCallback(
-                fn($file) => $file != '/recordings/users-inbound-still-recording-file-name-mix.wav'
+                fn($file) => $file != 'users-inbound-still-recording-file-name-mix.wav'
             );
 
         $this->serviceContainer->set(

microservices/recordings/tests/Service/EncoderTest.php

@@ -17,90 +17,36 @@ protected function setUp(): void
 
     public function test_runer()
     {
-        $this->it_detects_opened_for_writing_file();
-        $this->it_detectects_opened_for_read_file();
-        $this->it_detects_unopened_file();
-        $this->it_launch_exception_on_wrong_file();
+        $this->it_detects_incoming_recording();
+        $this->it_detects_ended_recording();
     }
 
-    private function it_detects_opened_for_writing_file()
+    private function it_detects_incoming_recording()
     {
         $file = tempnam('/tmp', 'test');
-
         $this->assertNotFalse(
             $file,
             'Create temporary file failed'
         );
 
-        $fd = fopen($file, 'w');
-
         $this->assertNotFalse(
-            $fd,
-            'Open for writing temporary file failed'
+            file_put_contents($file . '.meta', 'dummy'),
+            'Creating temporary file failed'
         );
 
         $checker = $this->serviceContainer->get('Service\RecordingEndedChecker');
 
         $this->assertFalse(
-            $checker->execute($file)
+            $checker->execute(basename($file) . '-mix.wav')
         );
-
-        fclose($fd);
-        unlink($file);
     }
 
-    private function it_detectects_opened_for_read_file()
+    private function it_detects_ended_recording()
     {
-        $file = tempnam('/tmp', 'test');
-
-        $this->assertNotFalse(
-            $file,
-            'Create temporary file failed'
-        );
-
-        $fd = fopen($file, 'r');
-
-        $this->assertNotFalse(
-            $fd,
-            'Open for reading temporary file failed'
-        );
-
         $checker = $this->serviceContainer->get('Service\RecordingEndedChecker');
 
         $this->assertTrue(
-            $checker->execute($file)
+            $checker->execute(basename('dummy-file-name-mix.wav'))
         );
-
-        fclose($fd);
-        unlink($file);
-    }
-
-    private function it_detects_unopened_file()
-    {
-        $file = tempnam('/tmp', 'test');
-
-        $this->assertNotFalse(
-            $file,
-            'Create temporary file failed'
-        );
-
-        $checker = $this->serviceContainer->get('Service\RecordingEndedChecker');
-
-        $this->assertTrue(
-            $checker->execute($file)
-        );
-
-        unlink($file);
-    }
-
-    private function it_launch_exception_on_wrong_file()
-    {
-        $file = tempnam('/tmp', 'test');
-        unlink($file);
-
-        $checker = $this->serviceContainer->get('Service\RecordingEndedChecker');
-
-        $this->expectExceptionCode(404);
-        $checker->execute($file);
     }
 }