MC-5926: Conflict of simultaneous write in Redis cache

- consolidate cache flush into method

Author: cpartica

app/code/Magento/Deploy/Model/Filesystem.php

@@ -139,16 +139,12 @@ public function regenerateStatic(
             ]
         );
 
-        // Cache flush will regenerate needed folders structure for compilation and deploy that were deleted previously
-        $cmd = $this->functionCallPath . 'cache:flush ';
-        $this->shell->execute($cmd);
+        $this->reinitCacheDirectories();
 
         // Trigger code generation
         $this->compile($output);
 
-        // Cache flush will regenerate needed folders structure for compilation and deploy that were deleted previously
-        $cmd = $this->functionCallPath . 'cache:flush ';
-        $this->shell->execute($cmd);
+        $this->reinitCacheDirectories();
 
         // Trigger static assets compilation and deployment
         $this->deployStaticContent($output);
@@ -344,4 +340,15 @@ public function lockStaticResources()
             self::PERMISSIONS_FILE
         );
     }
+
+    /**
+     * Flush cache and restore the basic cache directories.
+     *
+     * @throws LocalizedException
+     */
+    private function reinitCacheDirectories()
+    {
+        $command = $this->functionCallPath . 'cache:flush';
+        $this->shell->execute($command);
+    }
 }