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

Add deprecation warning for negative index.unassigned.node_left.delayed_timeout #26832

Merged
merged 14 commits into from
Oct 9, 2017
Merged

Add deprecation warning for negative index.unassigned.node_left.delayed_timeout #26832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
99ec200
Add deprecation warning in getRemainingDelay()
DaveCTurner Sep 29, 2017
8a312cc
Revert "Add deprecation warning in getRemainingDelay()"
DaveCTurner Oct 4, 2017
75f5fc6
Line too long
DaveCTurner Oct 4, 2017
13318ed
Introduce optional futureMinValue argument
DaveCTurner Oct 4, 2017
37076fb
Introduce Setting#timeSettingWithNegativeValuesDeprecated() and use i…
DaveCTurner Oct 4, 2017
6711490
Revert "Introduce optional futureMinValue argument"
DaveCTurner Oct 4, 2017
d94ff25
Make DeprecationLoggerHolder public
DaveCTurner Oct 4, 2017
37bc8a6
Inline timeSettingWithNegativeValuesDeprecated()
DaveCTurner Oct 4, 2017
a8c565a
Reinstate (unused, but removed-in-error) import
DaveCTurner Oct 4, 2017
b5a2a4d
Line length
DaveCTurner Oct 4, 2017
6f8269e
Use our own DeprecationLogger
DaveCTurner Oct 4, 2017
3e6fb49
Use the logger for the right class this time
DaveCTurner Oct 4, 2017
9616630
A little less tautology and a little more action please
DaveCTurner Oct 5, 2017
95d1097
Test that the warning is fired
DaveCTurner Oct 5, 2017
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
16 changes: 14 additions & 2 deletions core/src/main/java/org/elasticsearch/cluster/routing/UnassignedInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import org.elasticsearch.common.io.stream.Writeable;
import org.elasticsearch.common.joda.FormatDateTimeFormatter;
import org.elasticsearch.common.joda.Joda;
import org.elasticsearch.common.logging.DeprecationLogger;
import org.elasticsearch.common.logging.Loggers;
import org.elasticsearch.common.settings.Setting;
import org.elasticsearch.common.settings.Setting.Property;
import org.elasticsearch.common.settings.Settings;
Expand All @@ -47,11 +49,21 @@
*/
public final class UnassignedInfo implements ToXContentFragment, Writeable {

private static final DeprecationLogger DEPRECATION_LOGGER = new DeprecationLogger(Loggers.getLogger(UnassignedInfo.class));

public static final FormatDateTimeFormatter DATE_TIME_FORMATTER = Joda.forPattern("dateOptionalTime");

public static final Setting<TimeValue> INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING =
Setting.timeSetting("index.unassigned.node_left.delayed_timeout", TimeValue.timeValueMinutes(1), Property.Dynamic,
Property.IndexScope);
new Setting<>("index.unassigned.node_left.delayed_timeout", (s) -> TimeValue.timeValueMinutes(1).getStringRep(), (s) -> {
TimeValue parsedValue = TimeValue.parseTimeValue(s, "index.unassigned.node_left.delayed_timeout");
if (parsedValue.getNanos() < 0) {
DEPRECATION_LOGGER.deprecated(
"Negative values for index.unassigned.node_left.delayed_timeout [{}]" +
" are deprecated and should now be set to \"0\".", s);
}
return parsedValue;
}, Property.Dynamic, Property.IndexScope);

/**
* Reason why the shard is in unassigned state.
* <p>
Expand Down
7 changes: 7 additions & 0 deletions core/src/test/java/org/elasticsearch/cluster/routing/UnassignedInfoTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,4 +356,11 @@ public void testAllocationStatusSerialization() throws IOException {
assertThat(readStatus, equalTo(allocationStatus));
}
}

public void testNegativeTimeoutDeprecated() {
Settings settings = settings(Version.CURRENT).put(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.getKey(), "-1s").build();
assertThat(UnassignedInfo.INDEX_DELAYED_NODE_LEFT_TIMEOUT_SETTING.get(settings).seconds(), equalTo(-1L));
assertWarnings("Negative values for index.unassigned.node_left.delayed_timeout [-1s]" +
" are deprecated and should now be set to \"0\".");
}
}