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

[7.x] Adjust SearchableSnapshotsLicenseIntegTests.testShardAllocationOnInvalidLicense (#77757) #77759

Merged
merged 1 commit into from
Sep 15, 2021
Merged

[7.x] Adjust SearchableSnapshotsLicenseIntegTests.testShardAllocationOnInvalidLicense (#77757) #77759

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 14 additions & 20 deletions ...ava/org/elasticsearch/xpack/searchablesnapshots/SearchableSnapshotsLicenseIntegTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import org.elasticsearch.cluster.ClusterState;
import org.elasticsearch.cluster.health.ClusterHealthStatus;
import org.elasticsearch.cluster.metadata.Metadata;
import org.elasticsearch.cluster.service.ClusterService;
import org.elasticsearch.common.Strings;
import org.elasticsearch.common.settings.Settings;
import org.elasticsearch.license.DeleteLicenseAction;
Expand All @@ -36,7 +35,6 @@
import org.elasticsearch.license.PostStartTrialResponse;
import org.elasticsearch.protocol.xpack.license.DeleteLicenseRequest;
import org.elasticsearch.test.ESIntegTestCase;
import org.elasticsearch.test.junit.annotations.TestLogging;
import org.elasticsearch.xpack.core.searchablesnapshots.MountSearchableSnapshotAction;
import org.elasticsearch.xpack.core.searchablesnapshots.MountSearchableSnapshotRequest;
import org.elasticsearch.xpack.searchablesnapshots.action.ClearSearchableSnapshotsCacheAction;
Expand All @@ -56,6 +54,7 @@
import static org.hamcrest.Matchers.greaterThan;
import static org.hamcrest.Matchers.instanceOf;
import static org.hamcrest.Matchers.notNullValue;
import static org.hamcrest.Matchers.oneOf;

@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST)
public class SearchableSnapshotsLicenseIntegTests extends BaseFrozenSearchableSnapshotsIntegTestCase {
Expand Down Expand Up @@ -145,7 +144,6 @@ public void testClearCacheRequiresLicense() throws ExecutionException, Interrupt
}
}

@TestLogging(reason = "https://github.com/elastic/elasticsearch/issues/72329", value = "org.elasticsearch.license:DEBUG")
public void testShardAllocationOnInvalidLicense() throws Exception {
// check that shards have been failed as part of invalid license
assertBusy(
Expand All @@ -170,23 +168,19 @@ public void testShardAllocationOnInvalidLicense() throws Exception {
waitNoPendingTasksOnAll();
ensureClusterStateConsistency();

try {
PostStartTrialRequest startTrialRequest = new PostStartTrialRequest().setType(License.LicenseType.TRIAL.getTypeName())
.acknowledge(true);
PostStartTrialResponse resp = client().execute(PostStartTrialAction.INSTANCE, startTrialRequest).get();
assertEquals(PostStartTrialResponse.Status.UPGRADED_TO_TRIAL, resp.getStatus());
} catch (AssertionError ae) {
try {
final ClusterService clusterService = internalCluster().getCurrentMasterNodeInstance(ClusterService.class);
logger.error(
"Failed to start trial license again, cluster state on master node is:\n{}",
Strings.toString(clusterService.state(), false, true)
);
} catch (Exception e) {
ae.addSuppressed(e);
}
throw ae;
}
PostStartTrialRequest request = new PostStartTrialRequest().setType(License.LicenseType.TRIAL.getTypeName()).acknowledge(true);
final PostStartTrialResponse response = client().execute(PostStartTrialAction.INSTANCE, request).get();
assertThat(
response.getStatus(),
oneOf(
PostStartTrialResponse.Status.UPGRADED_TO_TRIAL,
// The LicenceService automatically generates a license of {@link LicenceService#SELF_GENERATED_LICENSE_TYPE} type
// if there is no license found in the cluster state (see {@link LicenceService#registerOrUpdateSelfGeneratedLicense).
// Since this test explicitly removes the LicensesMetadata from cluster state it is possible that the self generated
// license is created before the PostStartTrialRequest is acked.
PostStartTrialResponse.Status.TRIAL_ALREADY_ACTIVATED
)
);
// check if cluster goes green again after valid license has been put in place
ensureGreen(indexName);
}
Expand Down