Skip to content
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

Jump to bottom

Safer Wait for Snapshot Success in ClusterPrivilegeTests #40943

Merged
merged 8 commits into from
May 21, 2019
Merged

Safer Wait for Snapshot Success in ClusterPrivilegeTests #40943

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b3871f3
Safer Wait for Snapshot Success in ClusterPrivilegeTests
original-brownbear Apr 8, 2019
5a3cb51
Merge remote-tracking branch 'elastic/master' into more-aggressive-cs…
original-brownbear Apr 11, 2019
db79de8
Revert "Safer Wait for Snapshot Success in ClusterPrivilegeTests"
original-brownbear Apr 11, 2019
f7c4afb
fixed again
original-brownbear Apr 12, 2019
ef03fb7
Merge remote-tracking branch 'elastic/master' into more-aggressive-cs…
original-brownbear Apr 12, 2019
7945e2d
Merge remote-tracking branch 'elastic/master' into more-aggressive-cs…
original-brownbear May 2, 2019
2239a35
Merge branch 'more-aggressive-cs-handle-snapshot-service' of github.c…
original-brownbear May 2, 2019
911224f
CR: test only fix
original-brownbear May 2, 2019
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
8 changes: 7 additions & 1 deletion ...ck/plugin/security/src/test/java/org/elasticsearch/integration/ClusterPrivilegeTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,14 @@
package org.elasticsearch.integration;

import org.elasticsearch.action.admin.cluster.snapshots.status.SnapshotsStatusResponse;
import org.elasticsearch.action.admin.cluster.state.ClusterStateRequest;
import org.elasticsearch.client.Request;
import org.elasticsearch.cluster.SnapshotsInProgress;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.settings.SecureString;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.xpack.core.security.authc.support.Hasher;
import org.hamcrest.Matchers;
import org.junit.AfterClass;
import org.junit.BeforeClass;

Expand Down Expand Up @@ -139,7 +141,6 @@ public void testThatClusterPrivilegesWorkAsExpectedViaHttp() throws Exception {
assertAccessIsDenied("user_d", "PUT", "/_cluster/settings", "{ \"transient\" : { \"search.default_search_timeout\": \"1m\" } }");
}

@AwaitsFix( bugUrl = "https://github.com/elastic/elasticsearch/issues/38030")
public void testThatSnapshotAndRestore() throws Exception {
String repoJson = Strings.toString(jsonBuilder().startObject().field("type", "fs").startObject("settings").field("location",
repositoryLocation.toString()).endObject().endObject());
Expand Down Expand Up @@ -203,6 +204,11 @@ private void waitForSnapshotToFinish(String repo, String snapshot) throws Except
assertBusy(() -> {
SnapshotsStatusResponse response = client().admin().cluster().prepareSnapshotStatus(repo).setSnapshots(snapshot).get();
assertThat(response.getSnapshots().get(0).getState(), is(SnapshotsInProgress.State.SUCCESS));
// The status of the snapshot in the repository can become SUCCESS before it is fully finalized in the cluster state so wait for
// it to disappear from the cluster state as well
SnapshotsInProgress snapshotsInProgress =
client().admin().cluster().state(new ClusterStateRequest()).get().getState().custom(SnapshotsInProgress.TYPE);
assertThat(snapshotsInProgress.entries(), Matchers.empty());
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@original-brownbear you've got my rubber stamp LGTM , but shouldn't we fix the prepareSnapshotStatus(repo).setSnapshots(snapshot) API to not return SUCCESS if there is still an SnapshotsInProgress.TYPE entry?

}
}