Skip to content

Merge feature/searchable-snapshots branch into 7.x (#54803) #54825

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Apr 7, 2020
Merged

Merge feature/searchable-snapshots branch into 7.x (#54803) #54825

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f108eb1
Merge feature/searchable-snapshots branch into master (#54803)
tlrx Apr 6, 2020
6f50c92
Fix stuff after cherry-picking
tlrx Apr 6, 2020
a114549
Mute testDeleteActionDeletesSearchableSnapshot (#54818)
andreidan Apr 6, 2020
48cbca1
Tests: only build the IndexMetadata once
andreidan Apr 6, 2020
50186b2
Fix TimeSeriesLifecycleActionsIT
andreidan Apr 6, 2020
aae12bb
Set missing feature flag in searchable snapshots QA Azure test (#54861)
tlrx Apr 7, 2020
6f330e3
Fix serialization bug in SearchableSnapshotsStatsResponse (#54864)
tlrx Apr 7, 2020
bf72c02
Adjust skip versions in YAML tests
tlrx Apr 7, 2020
a51955f
Adjust Transport client settings and plugins
tlrx Apr 7, 2020
cba13d2
apply feedback
tlrx Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions ...pshots/src/main/java/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshots.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,15 +237,11 @@ && isSearchableSnapshotStore(indexSettings.getSettings())

@Override
public List<ActionHandler<? extends ActionRequest, ? extends ActionResponse>> getActions() {
if (SEARCHABLE_SNAPSHOTS_FEATURE_ENABLED) {
return org.elasticsearch.common.collect.List.of(
new ActionHandler<>(SearchableSnapshotsStatsAction.INSTANCE, TransportSearchableSnapshotsStatsAction.class),
new ActionHandler<>(ClearSearchableSnapshotsCacheAction.INSTANCE, TransportClearSearchableSnapshotsCacheAction.class),
new ActionHandler<>(MountSearchableSnapshotAction.INSTANCE, TransportMountSearchableSnapshotAction.class)
);
} else {
return emptyList();
}
return org.elasticsearch.common.collect.List.of(
new ActionHandler<>(SearchableSnapshotsStatsAction.INSTANCE, TransportSearchableSnapshotsStatsAction.class),
new ActionHandler<>(ClearSearchableSnapshotsCacheAction.INSTANCE, TransportClearSearchableSnapshotsCacheAction.class),
new ActionHandler<>(MountSearchableSnapshotAction.INSTANCE, TransportMountSearchableSnapshotAction.class)
);
}

public List<RestHandler> getRestHandlers(
Expand Down
20 changes: 16 additions & 4 deletions ...ava/org/elasticsearch/xpack/searchablesnapshots/BaseSearchableSnapshotsIntegTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,20 +24,19 @@
*/
package org.elasticsearch.xpack.searchablesnapshots;

import org.elasticsearch.common.collect.List;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.common.unit.ByteSizeUnit;
import org.elasticsearch.common.unit.ByteSizeValue;
import org.elasticsearch.license.LicenseService;
import org.elasticsearch.plugins.Plugin;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.xpack.core.LocalStateCompositeXPackPlugin;
import org.elasticsearch.xpack.core.XPackSettings;
import org.elasticsearch.xpack.searchablesnapshots.cache.CacheService;

import java.util.Collection;

import static java.util.Arrays.asList;
import static java.util.Collections.unmodifiableList;

public abstract class BaseSearchableSnapshotsIntegTestCase extends ESIntegTestCase {
@Override
protected boolean addMockInternalEngine() {
Expand All @@ -46,13 +45,19 @@ protected boolean addMockInternalEngine() {

@Override
protected Collection<Class<? extends Plugin>> nodePlugins() {
return unmodifiableList(asList(SearchableSnapshots.class, LocalStateCompositeXPackPlugin.class));
return List.of(SearchableSnapshots.class, LocalStateCompositeXPackPlugin.class);
}

@Override
protected Collection<Class<? extends Plugin>> transportClientPlugins() {
return nodePlugins();
}

@Override
protected Settings nodeSettings(int nodeOrdinal) {
final Settings.Builder builder = Settings.builder().put(super.nodeSettings(nodeOrdinal));
builder.put(LicenseService.SELF_GENERATED_LICENSE_TYPE.getKey(), "trial");
builder.put(XPackSettings.SECURITY_ENABLED.getKey(), false);
if (randomBoolean()) {
builder.put(
CacheService.SNAPSHOT_CACHE_SIZE_SETTING.getKey(),
Expand All @@ -71,4 +76,11 @@ protected Settings nodeSettings(int nodeOrdinal) {
}
return builder.build();
}

@Override
protected Settings transportClientSettings() {
final Settings.Builder builder = Settings.builder().put(super.transportClientSettings());
builder.put(XPackSettings.SECURITY_ENABLED.getKey(), false);
return builder.build();
}
}