Repository: falcon Updated Branches: refs/heads/master 90c955db1 -> 39f64a08e
FALCON-2336 StartupProperties shouldn't have specific logic to handle⦠⦠safemode property Author: pallavi-rao <[email protected]> Reviewers: @sandeepSamudrala Closes #410 from pallavi-rao/2336 Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/39f64a08 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/39f64a08 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/39f64a08 Branch: refs/heads/master Commit: 39f64a08e4b1ef0fbd33f4eb1ae2d69ad408d12b Parents: 90c955d Author: pallavi-rao <[email protected]> Authored: Thu Aug 9 15:54:53 2018 +0530 Committer: pallavi-rao <[email protected]> Committed: Thu Aug 9 15:54:53 2018 +0530 ---------------------------------------------------------------------- .../src/main/java/org/apache/falcon/util/StartupProperties.java | 5 ----- prism/src/main/java/org/apache/falcon/FalconServer.java | 2 ++ 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/39f64a08/common/src/main/java/org/apache/falcon/util/StartupProperties.java ---------------------------------------------------------------------- diff --git a/common/src/main/java/org/apache/falcon/util/StartupProperties.java b/common/src/main/java/org/apache/falcon/util/StartupProperties.java index 102b88c..33054fe 100644 --- a/common/src/main/java/org/apache/falcon/util/StartupProperties.java +++ b/common/src/main/java/org/apache/falcon/util/StartupProperties.java @@ -63,15 +63,10 @@ public final class StartupProperties extends ApplicationProperties { INSTANCE.compareAndSet(null, new StartupProperties()); storePath = new Path((INSTANCE.get().getProperty(CONFIGSTORE_PROPERTY))); fileSystem = HadoopClientFactory.get().createFalconFileSystem(storePath.toUri()); - String isSafeMode = (doesSafemodeFileExist()) ? "true" : "false"; - LOG.info("Initializing Falcon StartupProperties with safemode set to {}.", isSafeMode); - INSTANCE.get().setProperty(SAFEMODE_PROPERTY, isSafeMode); } return INSTANCE.get(); } catch (FalconException e) { throw new RuntimeException("Unable to read application startup properties", e); - } catch (IOException e) { - throw new RuntimeException("Unable to verify Falcon safemode", e); } } http://git-wip-us.apache.org/repos/asf/falcon/blob/39f64a08/prism/src/main/java/org/apache/falcon/FalconServer.java ---------------------------------------------------------------------- diff --git a/prism/src/main/java/org/apache/falcon/FalconServer.java b/prism/src/main/java/org/apache/falcon/FalconServer.java index 3d9879a..8856c32 100644 --- a/prism/src/main/java/org/apache/falcon/FalconServer.java +++ b/prism/src/main/java/org/apache/falcon/FalconServer.java @@ -99,9 +99,11 @@ public final class FalconServer { boolean isSafeMode = Boolean.parseBoolean(cmd.getOptionValue(SAFE_MODE)); if (isSafeMode) { StartupProperties.createSafemodeFile(); + LOG.info("Falcon is starting in safemode."); } else { StartupProperties.deleteSafemodeFile(); } + StartupProperties.get().setProperty(StartupProperties.SAFEMODE_PROPERTY, Boolean.toString(isSafeMode)); } final String enableTLSFlag = StartupProperties.get().getProperty("falcon.enableTLS");
