joerg/elx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

add flush and refresh action to index shift operation

Browse source
This commit is contained in:
Jörg Prante 2024-08-02 09:31:25 +02:00
parent b61ef22086
commit a8cd5591af
8 changed files with 75 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
elx-api/src/main/java/org/xbib/elx/api/BasicClient.java
View file

@ -55,5 +55,19 @@ public interface BasicClient extends Closeable {
boolean isIndexClosed(IndexDefinition indexDefinition);
/**
* Flush the index. The cluster clears cache and completes indexing.
*
* @param indexDefinition index definition
*/
void flushIndex(IndexDefinition indexDefinition);
/**
* Refresh the index. The cluster will flush the index and prepare for search.
*
* @param indexDefinition index definition
*/
void refreshIndex(IndexDefinition indexDefinition);
ScheduledExecutorService getScheduler();
}

14
elx-api/src/main/java/org/xbib/elx/api/BulkClient.java
View file

@ -130,19 +130,5 @@ public interface BulkClient extends BasicClient, Flushable {
*/
void updateIndexSetting(String index, String key, Object value, long timeout, TimeUnit timeUnit);
/**
* Refresh the index.
*
* @param indexDefinition index definition
*/
void refreshIndex(IndexDefinition indexDefinition);
/**
* Flush the index. The cluster clears cache and completes indexing.
*
* @param indexDefinition index definition
*/
void flushIndex(IndexDefinition indexDefinition);
BulkProcessor getBulkProcessor();
}

7
elx-common/src/main/java/org/xbib/elx/common/AbstractAdminClient.java
View file

@ -351,8 +351,12 @@ public abstract class AbstractAdminClient extends AbstractBasicClient implements
return new EmptyIndexShiftResult();
}
if (indexDefinition.isShiftEnabled()) {
logger.log(Level.INFO, "before shift, flushing index " + indexDefinition);
flushIndex(indexDefinition);
logger.log(Level.INFO, "before shift, refreshing index " + indexDefinition);
refreshIndex(indexDefinition);
if (indexDefinition.isShiftNotEmpty() && isIndexEmpty(indexDefinition)) {
logger.log(Level.WARNING, "index is empty, deleting index, disabling definition, rejecting to continue shifting: " +
logger.log(Level.WARNING, "something is wrong, the index is empty. Deleting index, disabling definition, rejecting to continue shifting: " +
indexDefinition);
deleteIndex(indexDefinition);
indexDefinition.setEnabled(false);
@ -360,6 +364,7 @@ public abstract class AbstractAdminClient extends AbstractBasicClient implements
return new EmptyIndexShiftResult();
}
if (indexDefinition.isCloseShifted()) {
logger.log(Level.INFO, "before shift, closing all previous indices of " + indexDefinition);
getAlias(indexDefinition.getIndex()).stream()
.filter(s -> !s.equals(indexDefinition.getFullIndexName()))
.forEach(this::closeIndex);

22
elx-common/src/main/java/org/xbib/elx/common/AbstractBasicClient.java
View file

@ -16,6 +16,10 @@ import org.elasticsearch.action.admin.cluster.state.ClusterStateResponse;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsAction;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsRequest;
import org.elasticsearch.action.admin.indices.exists.indices.IndicesExistsResponse;
import org.elasticsearch.action.admin.indices.flush.FlushAction;
import org.elasticsearch.action.admin.indices.flush.FlushRequest;
import org.elasticsearch.action.admin.indices.refresh.RefreshAction;
import org.elasticsearch.action.admin.indices.refresh.RefreshRequest;
import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsAction;
import org.elasticsearch.action.admin.indices.settings.put.UpdateSettingsRequest;
import org.elasticsearch.action.search.SearchAction;
@ -256,6 +260,24 @@ public abstract class AbstractBasicClient implements BasicClient {
return "OPEN".equals(state);
}
@Override
public void flushIndex(IndexDefinition indexDefinition) {
if (isIndexDefinitionDisabled(indexDefinition)) {
return;
}
ensureClientIsPresent();
client.execute(FlushAction.INSTANCE, new FlushRequest(indexDefinition.getFullIndexName())).actionGet();
}
@Override
public void refreshIndex(IndexDefinition indexDefinition) {
if (isIndexDefinitionDisabled(indexDefinition)) {
return;
}
ensureClientIsPresent();
client.execute(RefreshAction.INSTANCE, new RefreshRequest(indexDefinition.getFullIndexName())).actionGet();
}
protected abstract ElasticsearchClient createClient(Settings settings);
protected abstract void closeClient(Settings settings);

17
elx-common/src/main/java/org/xbib/elx/common/AbstractBulkClient.java
View file

@ -251,21 +251,4 @@ public abstract class AbstractBulkClient extends AbstractBasicClient implements
super.updateIndexSetting(index, key, value, timeout, timeUnit);
}
@Override
public void flushIndex(IndexDefinition indexDefinition) {
if (isIndexDefinitionDisabled(indexDefinition)) {
return;
}
ensureClientIsPresent();
client.execute(FlushAction.INSTANCE, new FlushRequest(indexDefinition.getFullIndexName())).actionGet();
}
@Override
public void refreshIndex(IndexDefinition indexDefinition) {
if (isIndexDefinitionDisabled(indexDefinition)) {
return;
}
ensureClientIsPresent();
client.execute(RefreshAction.INSTANCE, new RefreshRequest(indexDefinition.getFullIndexName())).actionGet();
}
}

31
elx-http/src/main/java/org/xbib/elx/http/action/admin/indices/flush/HttpFlushIndexAction.java Normal file
View file

@ -0,0 +1,31 @@
package org.xbib.elx.http.action.admin.indices.flush;
import org.elasticsearch.action.admin.indices.flush.FlushAction;
import org.elasticsearch.action.admin.indices.flush.FlushRequest;
import org.elasticsearch.action.admin.indices.flush.FlushResponse;
import org.elasticsearch.common.CheckedFunction;
import org.elasticsearch.common.xcontent.XContentParser;
import org.xbib.elx.http.HttpAction;
import org.xbib.net.http.client.HttpResponse;
import org.xbib.net.http.client.netty.HttpRequestBuilder;
import java.io.IOException;
public class HttpFlushIndexAction extends HttpAction<FlushRequest, FlushResponse> {
@Override
public FlushAction getActionInstance() {
return FlushAction.INSTANCE;
}
@Override
protected HttpRequestBuilder createHttpRequest(String url, FlushRequest request) {
String index = request.indices() != null ? String.join(",", request.indices()) + "/" : "";
return newPostRequest(url, "/" + index + "_flush");
}
@Override
protected CheckedFunction<XContentParser, FlushResponse, IOException> entityParser(HttpResponse httpResponse) {
return FlushResponse::fromXContent;
}
}

1
elx-http/src/main/resources/META-INF/services/org.xbib.elx.http.HttpAction
View file

@ -8,6 +8,7 @@ org.xbib.elx.http.action.admin.indices.close.HttpCloseIndexAction
org.xbib.elx.http.action.admin.indices.create.HttpCreateIndexAction
org.xbib.elx.http.action.admin.indices.delete.HttpDeleteIndexAction
org.xbib.elx.http.action.admin.indices.exists.indices.HttpIndicesExistsAction
org.xbib.elx.http.action.admin.indices.flush.HttpFlushIndexAction
org.xbib.elx.http.action.admin.indices.forcemerge.HttpForceMergeAction
org.xbib.elx.http.action.admin.indices.get.HttpGetIndexAction
org.xbib.elx.http.action.admin.indices.mapping.get.HttpGetMappingsAction

2
gradle.properties
View file

@ -1,3 +1,3 @@
group = org.xbib
name = elx
version = 7.10.2.47
version = 7.10.2.48