Repository: oozie Updated Branches: refs/heads/master be37ecaa2 -> dd71192fe
OOZIE-3142 Integer Overflows in Purge retentionTime (Prabhu Joseph via andras.piros) Project: http://git-wip-us.apache.org/repos/asf/oozie/repo Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/dd71192f Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/dd71192f Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/dd71192f Branch: refs/heads/master Commit: dd71192fe6406697719bb57333805f6d4f34394f Parents: be37eca Author: Andras Piros <andras.pi...@cloudera.com> Authored: Mon Dec 18 09:23:38 2017 +0100 Committer: Andras Piros <andras.pi...@cloudera.com> Committed: Mon Dec 18 09:23:38 2017 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/oozie/service/ShareLibService.java | 2 +- .../java/org/apache/oozie/service/TestShareLibService.java | 9 +++++++++ release-log.txt | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/oozie/blob/dd71192f/core/src/main/java/org/apache/oozie/service/ShareLibService.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/oozie/service/ShareLibService.java b/core/src/main/java/org/apache/oozie/service/ShareLibService.java index 8986a49..974dc7b 100644 --- a/core/src/main/java/org/apache/oozie/service/ShareLibService.java +++ b/core/src/main/java/org/apache/oozie/service/ShareLibService.java @@ -113,7 +113,7 @@ public class ShareLibService implements Service, Instrumentable { FileSystem fs; FileSystem localFs; - final long retentionTime = 1000 * 60 * 60 * 24 * ConfigurationService.getInt(LAUNCHERJAR_LIB_RETENTION); + final long retentionTime = 1000L * 60 * 60 * 24 * ConfigurationService.getInt(LAUNCHERJAR_LIB_RETENTION); @Override public void init(Services services) throws ServiceException { http://git-wip-us.apache.org/repos/asf/oozie/blob/dd71192f/core/src/test/java/org/apache/oozie/service/TestShareLibService.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/oozie/service/TestShareLibService.java b/core/src/test/java/org/apache/oozie/service/TestShareLibService.java index a4f3919..d244166 100644 --- a/core/src/test/java/org/apache/oozie/service/TestShareLibService.java +++ b/core/src/test/java/org/apache/oozie/service/TestShareLibService.java @@ -244,6 +244,15 @@ public class TestShareLibService extends XFsTestCase { "pig-10.jar"); } + // retentionTime overflows to negative before OOZIE-3142 + @Test + public void testRetentionOverflow() throws Exception { + getOozieConfig().set(ShareLibService.LAUNCHERJAR_LIB_RETENTION, "25"); + services.init(); + ShareLibService shareLibService = services.get(ShareLibService.class); + assertTrue(shareLibService.retentionTime > 0); + } + @Test public void testPurgeShareLib() throws Exception { setShipLauncherInOozieConfig(); http://git-wip-us.apache.org/repos/asf/oozie/blob/dd71192f/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index 5e2f3d7..3e344b7 100644 --- a/release-log.txt +++ b/release-log.txt @@ -1,5 +1,6 @@ -- Oozie 5.0.0 release (trunk - unreleased) +OOZIE-3142 Integer Overflows in Purge retentionTime (Prabhu Joseph via andras.piros) OOZIE-3143 AG_Install.twiki needs some refinement (kmarton via andras.piros) OOZIE-3127 Remove redundant check for user (satishsaley) OOZIE-3139 Oozie validates workflow incorrectly (dionusos via pbacsko)
