honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-06 04:58:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optimize aliases processing

Browse Source 
Closes# 2832
This commit is contained in:
Igor Motov 2013-03-28 22:34:29 -04:00
parent 941aa17a43
commit b657bdfa1a
2 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/elasticsearch/index/aliases/IndexAliasesService.java
View File

@ -39,6 +39,7 @@ import org.elasticsearch.indices.AliasFilterParsingException;
import org.elasticsearch.indices.InvalidAliasNameException;
import java.io.IOException;
import java.util.Map;
import static org.elasticsearch.common.collect.MapBuilder.newMapBuilder;
@ -67,10 +68,20 @@ public class IndexAliasesService extends AbstractIndexComponent implements Itera
return aliases.get(alias);
}
public IndexAlias create(String alias, @Nullable CompressedString filter) {
return new IndexAlias(alias, filter, parse(alias, filter));
}
public void add(String alias, @Nullable CompressedString filter) {
add(new IndexAlias(alias, filter, parse(alias, filter)));
}
public void addAll(Map<String, IndexAlias> aliases) {
synchronized (mutex) {
this.aliases = newMapBuilder(this.aliases).putAll(aliases).immutableMap();
}
}
/**
* Returns the filter associated with listed filtering aliases.
* <p/>

42
src/main/java/org/elasticsearch/indices/cluster/IndicesClusterStateService.java
View File

@ -62,10 +62,13 @@ import org.elasticsearch.indices.recovery.RecoveryTarget;
import org.elasticsearch.indices.recovery.StartRecoveryRequest;
import org.elasticsearch.threadpool.ThreadPool;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Set;
import java.util.concurrent.ConcurrentMap;
import static com.google.common.collect.Maps.newHashMap;
import static com.google.common.collect.Sets.newHashSet;
import static org.elasticsearch.ExceptionsHelper.detailedMessage;
@ -433,9 +436,7 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
String index = indexMetaData.index();
IndexService indexService = indicesService.indexService(index);
IndexAliasesService indexAliasesService = indexService.aliasesService();
for (AliasMetaData aliasesMd : indexMetaData.aliases().values()) {
processAlias(index, aliasesMd.alias(), aliasesMd.filter(), indexAliasesService);
}
processAliases(index, indexMetaData.aliases().values(), indexAliasesService);
// go over and remove aliases
for (IndexAlias indexAlias : indexAliasesService) {
if (!indexMetaData.aliases().containsKey(indexAlias.alias())) {
@ -450,26 +451,31 @@ public class IndicesClusterStateService extends AbstractLifecycleComponent<Indic
}
}
private void processAlias(String index, String alias, CompressedString filter, IndexAliasesService indexAliasesService) {
try {
if (!indexAliasesService.hasAlias(alias)) {
if (logger.isDebugEnabled()) {
logger.debug("[{}] adding alias [{}], filter [{}]", index, alias, filter);
}
indexAliasesService.add(alias, filter);
} else {
if ((filter == null && indexAliasesService.alias(alias).filter() != null) ||
(filter != null && !filter.equals(indexAliasesService.alias(alias).filter()))) {
private void processAliases(String index, Collection<AliasMetaData> aliases, IndexAliasesService indexAliasesService) {
HashMap<String, IndexAlias> newAliases = newHashMap();
for (AliasMetaData aliasMd : aliases) {
String alias = aliasMd.alias();
CompressedString filter = aliasMd.filter();
try {
if (!indexAliasesService.hasAlias(alias)) {
if (logger.isDebugEnabled()) {
logger.debug("[{}] updating alias [{}], filter [{}]", index, alias, filter);
logger.debug("[{}] adding alias [{}], filter [{}]", index, alias, filter);
}
newAliases.put(alias, indexAliasesService.create(alias, filter));
} else {
if ((filter == null && indexAliasesService.alias(alias).filter() != null) ||
(filter != null && !filter.equals(indexAliasesService.alias(alias).filter()))) {
if (logger.isDebugEnabled()) {
logger.debug("[{}] updating alias [{}], filter [{}]", index, alias, filter);
}
newAliases.put(alias, indexAliasesService.create(alias, filter));
}
indexAliasesService.add(alias, filter);
}
} catch (Exception e) {
logger.warn("[{}] failed to add alias [{}], filter [{}]", e, index, alias, filter);
}
} catch (Exception e) {
logger.warn("[{}] failed to add alias [{}], filter [{}]", e, index, alias, filter);
}
indexAliasesService.addAll(newAliases);
}
private void applyNewOrUpdatedShards(final ClusterChangedEvent event) throws ElasticSearchException {