Ability to delete an index if expecting an alias
This commit is contained in:
parent
a7a23b92cb
commit
2958833012
|
@ -33,6 +33,7 @@ class ResetCommand extends ContainerAwareCommand
|
|||
->setName('fos:elastica:reset')
|
||||
->addOption('index', null, InputOption::VALUE_OPTIONAL, 'The index to reset')
|
||||
->addOption('type', null, InputOption::VALUE_OPTIONAL, 'The type to reset')
|
||||
->addOption('force', null, InputOption::VALUE_NONE, 'Force index deletion if same name as alias')
|
||||
->setDescription('Reset search indexes')
|
||||
;
|
||||
}
|
||||
|
@ -53,6 +54,7 @@ class ResetCommand extends ContainerAwareCommand
|
|||
{
|
||||
$index = $input->getOption('index');
|
||||
$type = $input->getOption('type');
|
||||
$force = (true == $input->getOption('force'));
|
||||
|
||||
if (null === $index && null !== $type) {
|
||||
throw new \InvalidArgumentException('Cannot specify type option without an index.');
|
||||
|
@ -69,7 +71,7 @@ class ResetCommand extends ContainerAwareCommand
|
|||
|
||||
foreach ($indexes as $index) {
|
||||
$output->writeln(sprintf('<info>Resetting</info> <comment>%s</comment>', $index));
|
||||
$this->resetter->resetIndex($index);
|
||||
$this->resetter->resetIndex($index, false, $force);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
12
Exception/AliasIsIndexException.php
Normal file
12
Exception/AliasIsIndexException.php
Normal file
|
@ -0,0 +1,12 @@
|
|||
<?php
|
||||
|
||||
namespace FOS\ElasticaBundle\Exception;
|
||||
|
||||
class AliasIsIndexException extends \Exception
|
||||
{
|
||||
public function __construct($indexName)
|
||||
{
|
||||
parent::__construct(sprintf('Expected alias %s instead of index', $indexName));
|
||||
}
|
||||
}
|
||||
|
|
@ -15,6 +15,7 @@ use Elastica\Exception\ExceptionInterface;
|
|||
use FOS\ElasticaBundle\Configuration\IndexConfig;
|
||||
use FOS\ElasticaBundle\Elastica\Client;
|
||||
use FOS\ElasticaBundle\Elastica\Index;
|
||||
use FOS\ElasticaBundle\Exception\AliasIsIndexException;
|
||||
|
||||
class AliasProcessor
|
||||
{
|
||||
|
@ -35,9 +36,10 @@ class AliasProcessor
|
|||
*
|
||||
* @param IndexConfig $indexConfig
|
||||
* @param Index $index
|
||||
* @param boolean $force If index exists with same name as alias, remove it
|
||||
* @throws \RuntimeException
|
||||
*/
|
||||
public function switchIndexAlias(IndexConfig $indexConfig, Index $index)
|
||||
public function switchIndexAlias(IndexConfig $indexConfig, Index $index, $force = false)
|
||||
{
|
||||
$client = $index->getClient();
|
||||
|
||||
|
@ -45,7 +47,16 @@ class AliasProcessor
|
|||
$oldIndexName = false;
|
||||
$newIndexName = $index->getName();
|
||||
|
||||
$aliasedIndexes = $this->getAliasedIndexes($client, $aliasName);
|
||||
$aliasedIndexes = array();
|
||||
try {
|
||||
$aliasedIndexes = $this->getAliasedIndexes($client, $aliasName);
|
||||
} catch(AliasIsIndexException $e) {
|
||||
if ($force) {
|
||||
$this->deleteIndex($client, $aliasName);
|
||||
} else {
|
||||
throw new \RuntimeException($e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
if (count($aliasedIndexes) > 1) {
|
||||
throw new \RuntimeException(
|
||||
|
@ -125,6 +136,9 @@ class AliasProcessor
|
|||
$aliasedIndexes = array();
|
||||
|
||||
foreach ($aliasesInfo as $indexName => $indexInfo) {
|
||||
if ($indexName == $aliasName) {
|
||||
throw new AliasIsIndexException($indexName);
|
||||
}
|
||||
$aliases = array_keys($indexInfo['aliases']);
|
||||
if (in_array($aliasName, $aliases)) {
|
||||
$aliasedIndexes[] = $indexName;
|
||||
|
@ -133,4 +147,15 @@ class AliasProcessor
|
|||
|
||||
return $aliasedIndexes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Delete an index
|
||||
*
|
||||
* @param string $indexName Index name to delete
|
||||
*/
|
||||
private function deleteIndex($client, $indexName)
|
||||
{
|
||||
$path = sprintf("%s", $indexName);
|
||||
$client->request($path, \Elastica\Request::DELETE);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -45,10 +45,10 @@ class Resetter
|
|||
/**
|
||||
* Deletes and recreates all indexes
|
||||
*/
|
||||
public function resetAllIndexes($populating = false)
|
||||
public function resetAllIndexes($populating = false, $force = false)
|
||||
{
|
||||
foreach ($this->configManager->getIndexNames() as $name) {
|
||||
$this->resetIndex($name, $populating);
|
||||
$this->resetIndex($name, $populating, $force);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -58,9 +58,10 @@ class Resetter
|
|||
*
|
||||
* @param string $indexName
|
||||
* @param bool $populating
|
||||
* @param bool $force If index exists with same name as alias, remove it
|
||||
* @throws \InvalidArgumentException if no index exists for the given name
|
||||
*/
|
||||
public function resetIndex($indexName, $populating = false)
|
||||
public function resetIndex($indexName, $populating = false, $force = false)
|
||||
{
|
||||
$indexConfig = $this->configManager->getIndexConfiguration($indexName);
|
||||
$index = $this->indexManager->getIndex($indexName);
|
||||
|
@ -73,7 +74,7 @@ class Resetter
|
|||
$index->create($mapping, true);
|
||||
|
||||
if (!$populating and $indexConfig->isUseAlias()) {
|
||||
$this->aliasProcessor->switchIndexAlias($indexConfig, $index);
|
||||
$this->aliasProcessor->switchIndexAlias($indexConfig, $index, $force);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue