From 51eae3ec3dc6d7d89ba8e8c6aa69fce14113e0cb Mon Sep 17 00:00:00 2001
From: Michael McCandless <mail@mikemccandless.com>
Date: Mon, 1 Jun 2015 16:15:35 -0400
Subject: [PATCH] parse longs not doubles, for the 'units missing' upgrade

---
 .../java/org/elasticsearch/cluster/metadata/MetaData.java | 8 ++++----
 .../cluster/metadata/MetaDataIndexUpgradeService.java     | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java
index d55083b58cf..7dfa3641e87 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaData.java
@@ -1324,11 +1324,11 @@ public class MetaData implements Iterable<IndexMetaData>, Diffable<MetaData> {
             String settingValue = ent.getValue();
             if (CLUSTER_BYTES_SIZE_SETTINGS.contains(settingName)) {
                 try {
-                    Double.parseDouble(settingValue);
+                    Long.parseLong(settingValue);
                 } catch (NumberFormatException nfe) {
                     continue;
                 }
-                // It's a naked number; add default unit (b for bytes):
+                // It's a naked number that previously would be interpreted as default unit (bytes); now we add it:
                 logger.warn("byte-sized cluster setting [{}] with value [{}] is missing units; now adding default units (b)", settingName, settingValue);
                 if (newPersistentSettings == null) {
                     newPersistentSettings = Settings.builder();
@@ -1338,11 +1338,11 @@ public class MetaData implements Iterable<IndexMetaData>, Diffable<MetaData> {
             }
             if (CLUSTER_TIME_SETTINGS.contains(settingName)) {
                 try {
-                    Double.parseDouble(settingValue);
+                    Long.parseLong(settingValue);
                 } catch (NumberFormatException nfe) {
                     continue;
                 }
-                // It's a naked number; add default unit (b for bytes):
+                // It's a naked number that previously would be interpreted as default unit (ms); now we add it:
                 logger.warn("time cluster setting [{}] with value [{}] is missing units; now adding default units (ms)", settingName, settingValue);
                 if (newPersistentSettings == null) {
                     newPersistentSettings = Settings.builder();
diff --git a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java
index 748cc7cfa7a..8a58a56e60e 100644
--- a/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java
+++ b/src/main/java/org/elasticsearch/cluster/metadata/MetaDataIndexUpgradeService.java
@@ -186,11 +186,11 @@ public class MetaDataIndexUpgradeService extends AbstractComponent {
                 String value = settings.get(byteSizeSetting);
                 if (value != null) {
                     try {
-                        Double.parseDouble(value);
+                        Long.parseLong(value);
                     } catch (NumberFormatException nfe) {
                         continue;
                     }
-                    // It's a naked number; add default unit (b for bytes):
+                    // It's a naked number that previously would be interpreted as default unit (bytes); now we add it:
                     logger.warn("byte-sized index setting [{}] with value [{}] is missing units; now adding default units (b)", byteSizeSetting, value);
                     if (newSettings == null) {
                         newSettings = Settings.builder();
@@ -203,11 +203,11 @@ public class MetaDataIndexUpgradeService extends AbstractComponent {
                 String value = settings.get(timeSetting);
                 if (value != null) {
                     try {
-                        Double.parseDouble(value);
+                        Long.parseLong(value);
                     } catch (NumberFormatException nfe) {
                         continue;
                     }
-                    // It's a naked number; add default unit (ms for msec):
+                    // It's a naked number that previously would be interpreted as default unit (ms); now we add it:
                     logger.warn("time index setting [{}] with value [{}] is missing units; now adding default units (ms)", timeSetting, value);
                     if (newSettings == null) {
                         newSettings = Settings.builder();