Watcher: Use joda method to get local TZ #35608
Merged
Conversation
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 commit switches from using java util's default timezone method to using joda. The former can cause problems when the string representation of the timezone is unknown to joda. closes elastic#35518
rjernst
added
>test
|
Pinging @elastic/es-core-infra |
jakelandis
reviewed
Nov 16, 2018
| @@ -31,7 +30,7 @@ public static void main(String[] args) throws Exception { | |||
| private static final DateTimeFormatter UTC_FORMATTER = DateTimeFormat.forPattern("EEE, d MMM yyyy HH:mm:ss") | |||
| .withZone(DateTimeZone.UTC).withLocale(Locale.ROOT); | |||
| private static final DateTimeFormatter LOCAL_FORMATTER = DateTimeFormat.forPattern("EEE, d MMM yyyy HH:mm:ss Z") | |||
| .withZone(DateTimeZone.forTimeZone(TimeZone.getDefault())); | |||
| .withZone(DateTimeZone.forTimeZone(null)); | |||
There was a problem hiding this comment.
minor: I think it would be a bit more obvious to explicitly call DateTimeZone.getDefault() instead of null.
Since that is what Joda does with the null value.
http://joda-time.sourceforge.net/apidocs/src-html/org/joda/time/DateTimeZone.html#line.301
There was a problem hiding this comment.
Doh! the recommendation is forbidden API ..never mind.
|
looks like the test failure may be related to the change |
|
The failure is odd...it does not reproduce for me. I also ran 100 iterations and I do not get any failures... |
|
LGTM |
|
Upon attempting to back port, I found the 6.x code does not have the local formatter, so I've only applied this change to master. |
jasontedor
added a commit
to jasontedor/elasticsearch
that referenced
this pull request
Nov 17, 2018
* master: (59 commits) SQL: Move internals from Joda to java.time (elastic#35649) Add HLRC docs for Get Lifecycle Policy (elastic#35612) Align RolloverStep's name with other step names (elastic#35655) Watcher: Use joda method to get local TZ (elastic#35608) Fix line length for org.elasticsearch.action.* files (elastic#35607) Remove use of AbstractComponent in server (elastic#35444) Deprecate types in count and msearch. (elastic#35421) Refactor an ambigious TermVectorsRequest constructor. (elastic#35614) [Scripting] Use Number as a return value for BucketAggregationScript (elastic#35653) Removes AbstractComponent from several classes (elastic#35566) [DOCS] Add beta warning to ILM pages. (elastic#35571) Deprecate types in validate query requests. (elastic#35575) Unmute BuildExamplePluginsIT Revert "AwaitsFix the RecoveryIT suite - see elastic#35597" Revert "[RCI] Check blocks while having index shard permit in TransportReplicationAction (elastic#35332)" Remove remaining line length violations for o.e.action.admin.cluster (elastic#35156) ML: Adjusing BWC version post backport to 6.6 (elastic#35605) [TEST] Replace fields in response with actual values Remove usages of CharSequence in Sets (elastic#35501) AwaitsFix the RecoveryIT suite - see elastic#35597 ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit switches from using java util's default timezone method to
using joda. The former can cause problems when the string representation
of the timezone is unknown to joda.
closes #35518