honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only add units to a snapshot that was created before 2.0

This commit is contained in:
Michael McCandless 2015-06-03 19:41:57 -04:00 committed by mikemccand
parent 3724756a1a
commit 2c4d59584f
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/java/org/elasticsearch/snapshots/RestoreService.java
View File

@ -157,9 +157,14 @@ public class RestoreService extends AbstractComponent implements ClusterStateLis
ImmutableList<String> filteredIndices = SnapshotUtils.filterIndices(snapshot.indices(), request.indices(), request.indicesOptions());
MetaData metaDataIn = repository.readSnapshotMetaData(snapshotId, filteredIndices);
// ES 2.0 now requires units for all time and byte-sized settings, so we add the default unit if it's missing in this snapshot:
// TODO: can we somehow only do this for pre-2.0 cluster state?
final MetaData metaData = MetaData.addDefaultUnitsIfNeeded(logger, metaDataIn);
final MetaData metaData;
if (snapshot.version().before(Version.V_2_0_0)) {
// ES 2.0 now requires units for all time and byte-sized settings, so we add the default unit if it's missing in this snapshot:
metaData = MetaData.addDefaultUnitsIfNeeded(logger, metaDataIn);
} else {
// Units are already enforced:
metaData = metaDataIn;
}
// Make sure that we can restore from this snapshot
validateSnapshotRestorable(snapshotId, snapshot);