forked from elastic/elasticsearch
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make Timestamps Returned by Snapshot APIs Consistent (elastic#43148)
* We don't have to calculate the start and end times form the shards for the status API, we have the start time available from the CS or the `SnapshotInfo` in the repo and can either take the end time form the `SnapshotInfo` or take the most recent time from the shard stats for in progress snapshots * Closes elastic#43074
- Loading branch information
1 parent
d2407d0
commit a7962ba
Showing
6 changed files
with
111 additions
and
15 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
74 changes: 74 additions & 0 deletions
74
server/src/test/java/org/elasticsearch/snapshots/SnapshotStatusApisIT.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,74 @@ | ||
| /* | ||
| * Licensed to Elasticsearch under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.elasticsearch.snapshots; | ||
|
|
||
| import org.elasticsearch.Version; | ||
| import org.elasticsearch.action.admin.cluster.snapshots.create.CreateSnapshotResponse; | ||
| import org.elasticsearch.action.admin.cluster.snapshots.status.SnapshotStatus; | ||
| import org.elasticsearch.action.admin.cluster.snapshots.status.SnapshotsStatusRequest; | ||
| import org.elasticsearch.client.Client; | ||
| import org.elasticsearch.common.settings.Settings; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; | ||
| import static org.hamcrest.Matchers.equalTo; | ||
| import static org.hamcrest.Matchers.greaterThan; | ||
|
|
||
| public class SnapshotStatusApisIT extends AbstractSnapshotIntegTestCase { | ||
|
|
||
| public void testStatusApiConsistency() { | ||
| Client client = client(); | ||
|
|
||
| logger.info("--> creating repository"); | ||
| assertAcked(client.admin().cluster().preparePutRepository("test-repo").setType("fs").setSettings( | ||
| Settings.builder().put("location", randomRepoPath()).build())); | ||
|
|
||
| createIndex("test-idx-1", "test-idx-2", "test-idx-3"); | ||
| ensureGreen(); | ||
|
|
||
| logger.info("--> indexing some data"); | ||
| for (int i = 0; i < 100; i++) { | ||
| index("test-idx-1", "_doc", Integer.toString(i), "foo", "bar" + i); | ||
| index("test-idx-2", "_doc", Integer.toString(i), "foo", "baz" + i); | ||
| index("test-idx-3", "_doc", Integer.toString(i), "foo", "baz" + i); | ||
| } | ||
| refresh(); | ||
|
|
||
| logger.info("--> snapshot"); | ||
| CreateSnapshotResponse createSnapshotResponse = client.admin().cluster().prepareCreateSnapshot("test-repo", "test-snap") | ||
| .setWaitForCompletion(true).get(); | ||
| assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(), greaterThan(0)); | ||
| assertThat(createSnapshotResponse.getSnapshotInfo().successfulShards(), | ||
| equalTo(createSnapshotResponse.getSnapshotInfo().totalShards())); | ||
|
|
||
| List<SnapshotInfo> snapshotInfos = client.admin().cluster().prepareGetSnapshots("test-repo").get().getSnapshots(); | ||
| assertThat(snapshotInfos.size(), equalTo(1)); | ||
| SnapshotInfo snapshotInfo = snapshotInfos.get(0); | ||
| assertThat(snapshotInfo.state(), equalTo(SnapshotState.SUCCESS)); | ||
| assertThat(snapshotInfo.version(), equalTo(Version.CURRENT)); | ||
|
|
||
| final List<SnapshotStatus> snapshotStatus = client.admin().cluster().snapshotsStatus( | ||
| new SnapshotsStatusRequest("test-repo", new String[]{"test-snap"})).actionGet().getSnapshots(); | ||
| assertThat(snapshotStatus.size(), equalTo(1)); | ||
| final SnapshotStatus snStatus = snapshotStatus.get(0); | ||
| assertEquals(snStatus.getStats().getStartTime(), snapshotInfo.startTime()); | ||
| assertEquals(snStatus.getStats().getTime(), snapshotInfo.endTime() - snapshotInfo.startTime()); | ||
| } | ||
| } |