falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From suh...@apache.org
Subject incubator-falcon git commit: FALCON-913. Change the default values of log clean up services. (Contributed by Suhas Vasu)
Date Fri, 28 Nov 2014 08:50:35 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master 4e7a552dc -> 587f08547


FALCON-913. Change the default values of log clean up services. (Contributed by Suhas Vasu)


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/587f0854
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/587f0854
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/587f0854

Branch: refs/heads/master
Commit: 587f0854782842457a4910f1e4a283595b3b5e48
Parents: 4e7a552
Author: Suhas V <suhas.v@inmobi.com>
Authored: Fri Nov 28 14:20:21 2014 +0530
Committer: Suhas V <suhas.v@inmobi.com>
Committed: Fri Nov 28 14:20:21 2014 +0530

----------------------------------------------------------------------
 CHANGES.txt                                     |  8 +++----
 .../falcon/cleanup/AbstractCleanupHandler.java  | 24 ++++++++++++++++++--
 common/src/main/resources/runtime.properties    |  5 ----
 src/conf/runtime.properties                     |  5 ----
 4 files changed, 26 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/587f0854/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index c9fda80..3df2b2a 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -17,9 +17,12 @@ Trunk (Unreleased)
    statements in webapp module (Ajay Yadav via Srikanth Sundarrajan)
 
   OPTIMIZATIONS
+   FALCON-913 Change the default values of log clean up services
+   (Suhas vasu)
 
   BUG FIXES
-
+   FALCON-917 Fix corner cases while getting job id during instance status
+   (Suhas Vasu) 
 
 
 Release Version: 0.6-incubating
@@ -170,9 +173,6 @@ Release Version: 0.6-incubating
   OPTIMIZATIONS
 
   BUG FIXES
-   FALCON-917 Fix corner cases while getting job id during instance status
-   (Suhas Vasu)
-
    FALCON-829 Better error message for cluster submission failure
    (Karan Kumar via Venkatesh Seetharam)
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/587f0854/common/src/main/java/org/apache/falcon/cleanup/AbstractCleanupHandler.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/falcon/cleanup/AbstractCleanupHandler.java b/common/src/main/java/org/apache/falcon/cleanup/AbstractCleanupHandler.java
index 6fa6c73..5a4dce6 100644
--- a/common/src/main/java/org/apache/falcon/cleanup/AbstractCleanupHandler.java
+++ b/common/src/main/java/org/apache/falcon/cleanup/AbstractCleanupHandler.java
@@ -70,8 +70,28 @@ public abstract class AbstractCleanupHandler {
     }
 
     private String getRetentionValue(Frequency.TimeUnit timeunit) {
-        return RuntimeProperties.get().getProperty(
-                "log.cleanup.frequency." + timeunit + ".retention", "days(1)");
+        String defaultValue;
+        switch (timeunit) {
+        case minutes:
+            defaultValue = "hours(24)";
+            break;
+
+        case hours:
+            defaultValue = "days(3)";
+            break;
+
+        case days:
+            defaultValue = "days(12)";
+            break;
+
+        case months:
+            defaultValue = "months(3)";
+            break;
+
+        default:
+            defaultValue = "days(1)";
+        }
+        return RuntimeProperties.get().getProperty("log.cleanup.frequency." + timeunit +
".retention", defaultValue);
     }
 
     protected FileStatus[] getAllLogs(FileSystem fs, Cluster cluster,

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/587f0854/common/src/main/resources/runtime.properties
----------------------------------------------------------------------
diff --git a/common/src/main/resources/runtime.properties b/common/src/main/resources/runtime.properties
index 1d35667..424c00d 100644
--- a/common/src/main/resources/runtime.properties
+++ b/common/src/main/resources/runtime.properties
@@ -18,11 +18,6 @@
 
 *.domain=debug
 
-*.log.cleanup.frequency.minutes.retention=minutes(15)
-*.log.cleanup.frequency.hours.retention=hours(6)
-*.log.cleanup.frequency.days.retention =days(7)
-*.log.cleanup.frequency.months.retention =months(3)
-
 *.falcon.parentworkflow.retry.max=3
 *.falcon.parentworkflow.retry.interval.secs=1
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/587f0854/src/conf/runtime.properties
----------------------------------------------------------------------
diff --git a/src/conf/runtime.properties b/src/conf/runtime.properties
index f9e26de..d5a8025 100644
--- a/src/conf/runtime.properties
+++ b/src/conf/runtime.properties
@@ -22,11 +22,6 @@
 
 *.domain=${falcon.app.type}
 
-*.log.cleanup.frequency.minutes.retention=minutes(15)
-*.log.cleanup.frequency.hours.retention=hours(6)
-*.log.cleanup.frequency.days.retention=days(7)
-*.log.cleanup.frequency.months.retention=months(3)
-
 #### To configure falcon servers with prism ####
 #prism should have the following properties
 prism.all.colos=local


Mime
View raw message