[TASK] Add UpdateAliasJob to switch the new index after processing all jobs

Author: dfeyer

Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/Command/NodeIndexQueueCommandController.php

@@ -7,6 +7,7 @@
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface;
 use Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\Domain\Repository\NodeDataRepository;
 use Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\IndexingJob;
+use Flowpack\ElasticSearch\ContentRepositoryQueueIndexer\UpdateAliasJob;
 use TYPO3\Flow\Annotations as Flow;
 use TYPO3\Flow\Cli\CommandController;
 use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Mapping\NodeTypeMappingBuilder;
@@ -81,6 +82,11 @@ public function buildCommand($workspace = NULL) {
 		} else {
 			$this->indexWorkspace($workspace, $indexPostfix);
 		}
+		$updateAliasJob = new UpdateAliasJob($indexPostfix);
+		$this->jobManager->queue('Flowpack.ElasticSearch.ContentRepositoryQueueIndexer', $updateAliasJob);
+
+		$this->outputLine();
+		$this->outputLine('Indexing jobs created with success ...');
 	}
 
 	/**

Classes/Flowpack/ElasticSearch/ContentRepositoryQueueIndexer/UpdateAliasJob.php

@@ -0,0 +1,88 @@
+<?php
+namespace Flowpack\ElasticSearch\ContentRepositoryQueueIndexer;
+
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\Indexer\NodeIndexer;
+use Flowpack\ElasticSearch\ContentRepositoryAdaptor\LoggerInterface;
+use TYPO3\Flow\Annotations as Flow;
+use TYPO3\Flow\Utility\Algorithms;
+use TYPO3\Jobqueue\Common\Job\JobInterface;
+use TYPO3\Jobqueue\Common\Queue\Message;
+use TYPO3\Jobqueue\Common\Queue\QueueInterface;
+use TYPO3\TYPO3CR\Domain\Factory\NodeFactory;
+use TYPO3\TYPO3CR\Domain\Model\NodeData;
+use TYPO3\TYPO3CR\Domain\Model\NodeInterface;
+use TYPO3\TYPO3CR\Domain\Repository\NodeDataRepository;
+use TYPO3\TYPO3CR\Domain\Service\ContextFactory;
+
+/**
+ * ElasticSearch Indexing Job Interface
+ */
+class UpdateAliasJob implements JobInterface {
+
+    /**
+     * @var NodeIndexer
+     * @Flow\Inject
+     */
+    protected $nodeIndexer;
+
+    /**
+     * @var LoggerInterface
+     * @Flow\Inject
+     */
+    protected $logger;
+
+    /**
+     * @var string
+     */
+    protected $identifier;
+
+    /**
+     * @var string
+     */
+    protected $indexPostfix;
+
+    /**
+     * @param string $indexPostfix
+     * @param string $workspaceName
+     * @param array $nodes
+     */
+    public function __construct($indexPostfix) {
+        $this->identifier = Algorithms::generateRandomString(24);
+        $this->indexPostfix = $indexPostfix;
+    }
+
+    /**
+     * Execute the job
+     * A job should finish itself after successful execution using the queue methods.
+     *
+     * @param QueueInterface $queue
+     * @param Message $message The original message
+     * @return boolean TRUE if the job was executed successfully and the message should be finished
+     */
+    public function execute(QueueInterface $queue, Message $message) {
+        $this->nodeIndexer->setIndexNamePostfix($this->indexPostfix);
+        $this->nodeIndexer->updateIndexAlias();
+        $this->logger->log(sprintf('Update Index Alias (%s)', $this->indexPostfix), LOG_NOTICE);
+
+        return TRUE;
+    }
+
+    /**
+     * Get an optional identifier for the job
+     *
+     * @return string A job identifier
+     */
+    public function getIdentifier() {
+        return $this->identifier;
+    }
+
+    /**
+     * Get a readable label for the job
+     *
+     * @return string A label for the job
+     */
+    public function getLabel() {
+        return sprintf('ElasticSearch Indexing Job (%s)', $this->getIdentifier());
+    }
+
+}