honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-03-06 10:59:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix several tests

Browse Source
This commit is contained in:
Simon Willnauer 2015-12-15 16:39:48 +01:00
parent 6ea266a89c
commit dbd7b5abbc
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java
View File

@ -96,10 +96,6 @@ public final class ClusterSettings extends AbstractScopedSettings {
IndicesTTLService.INDICES_TTL_INTERVAL_SETTING,
MappingUpdatedAction.INDICES_MAPPING_DYNAMIC_TIMEOUT_SETTING,
MetaData.SETTING_READ_ONLY_SETTING,
RecoverySettings.INDICES_RECOVERY_FILE_CHUNK_SIZE_SETTING,
RecoverySettings.INDICES_RECOVERY_TRANSLOG_OPS_SETTING,
RecoverySettings.INDICES_RECOVERY_TRANSLOG_SIZE_SETTING,
RecoverySettings.INDICES_RECOVERY_COMPRESS_SETTING,
RecoverySettings.INDICES_RECOVERY_CONCURRENT_STREAMS_SETTING,
RecoverySettings.INDICES_RECOVERY_CONCURRENT_SMALL_FILE_STREAMS_SETTING,
RecoverySettings.INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING,

2
core/src/main/java/org/elasticsearch/common/settings/Setting.java
View File

@ -116,6 +116,8 @@ public class Setting<T> extends ToXContentToBytes {
return parser.apply(value);
} catch (ElasticsearchParseException ex) {
throw new IllegalArgumentException(ex.getMessage(), ex);
} catch (IllegalArgumentException ex) {
throw ex;
} catch (Exception t) {
throw new IllegalArgumentException("Failed to parse value [" + value + "] for setting [" + getKey() + "]", t);
}

4
core/src/test/java/org/elasticsearch/cluster/settings/ClusterSettingsIT.java
View File

@ -256,7 +256,7 @@ public class ClusterSettingsIT extends ESIntegTestCase {
.setTransientSettings(Settings.builder().put(DiscoverySettings.PUBLISH_TIMEOUT_SETTING.getKey(), "whatever").build())
.get();
fail("bogus value");
} catch (ElasticsearchParseException ex) {
} catch (IllegalArgumentException ex) {
assertEquals(ex.getMessage(), "Failed to parse setting [discovery.zen.commit_timeout] with value [whatever] as a time value: unit is missing or unrecognized");
}
@ -268,7 +268,7 @@ public class ClusterSettingsIT extends ESIntegTestCase {
.setTransientSettings(Settings.builder().put(DiscoverySettings.PUBLISH_TIMEOUT_SETTING.getKey(), -1).build())
.get();
fail("bogus value");
} catch (ElasticsearchParseException ex) {
} catch (IllegalArgumentException ex) {
assertEquals(ex.getMessage(), "Failed to parse value [-1] for setting [discovery.zen.publish_timeout] must be >= 0s");
}