date:20180524

oozie git commit: OOZIE-3178 ./bin/mkdistro.sh -Papache-release fails due to javadoc errors (dbist13 via gezapeti)

2018-05-24 Thread gezapeti

Repository: oozie
Updated Branches:
  refs/heads/master f9f6a87f8 -> 2805ab66f


OOZIE-3178 ./bin/mkdistro.sh -Papache-release fails due to javadoc errors 
(dbist13 via gezapeti)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/2805ab66
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/2805ab66
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/2805ab66

Branch: refs/heads/master
Commit: 2805ab66fb28114c7d3de892c0f6f317626cb65c
Parents: f9f6a87
Author: Gezapeti Cseh 
Authored: Thu May 24 20:00:34 2018 +0200
Committer: Gezapeti Cseh 
Committed: Thu May 24 20:00:34 2018 +0200

--
 bin/test-patch-09-javadoc   | 24 +++-
 .../apache/oozie/compression/CodecFactory.java  |  2 +-
 pom.xml |  2 +-
 release-log.txt |  1 +
 .../apache/oozie/tools/OozieDBExportCLI.java|  4 +---
 .../apache/oozie/tools/OozieDBImportCLI.java|  4 +---
 6 files changed, 28 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/2805ab66/bin/test-patch-09-javadoc
--
diff --git a/bin/test-patch-09-javadoc b/bin/test-patch-09-javadoc
index 01ec9a4..2a16b0c 100755
--- a/bin/test-patch-09-javadoc
+++ b/bin/test-patch-09-javadoc
@@ -81,7 +81,7 @@ checkForWarnings() {
   patchWarns=`grep '\[WARNING\]' ${REPORTDIR}/${TASKNAME}-patch.txt | awk 
'/Javadoc Warnings/,EOF' | grep warning | awk 'BEGIN {total = 0} {total += 1} 
END {print total}'`
   newWarns=`expr $patchWarns - $cleanWarns`
   if [[ $newWarns -le 0 ]] ; then
-REPORT+=("{color:green}+1{color} the patch does not seem to introduce new 
Javadoc warnings")
+REPORT+=("{color:green}+1{color} the patch does not seem to introduce new 
Javadoc warning(s)")
 newWarns=0
   else
 REPORT+=("{color:red}-1{color} the patch seems to introduce $newWarns new 
Javadoc warning(s)")
@@ -92,6 +92,22 @@ checkForWarnings() {
   fi
 }
 ###
+checkForErrors() {
+  cleanErrs=`grep '\[ERROR\]' ${REPORTDIR}/${TASKNAME}-clean.txt | grep error 
| awk 'BEGIN {total = 0} {total += 1} END {print total}'`
+  patchErrs=`grep '\[ERROR\]' ${REPORTDIR}/${TASKNAME}-patch.txt | grep error 
| awk 'BEGIN {total = 0} {total += 1} END {print total}'`
+  newErrs=`expr $patchErrs - $cleanErrs`
+  if [[ $newErrs -le 0 ]] ; then
+REPORT+=("{color:green}+1{color} the patch does not seem to introduce new 
Javadoc error(s)")
+newErrs=0
+  else
+REPORT+=("{color:red}-1{color} the patch seems to introduce $newErrs new 
Javadoc error(s)")
+newErrs=1
+  fi
+  if [[ $cleanErrs != 0 ]] ; then
+REPORT+=("{color:red}ERROR{color}: the current HEAD has $cleanErrs Javadoc 
error(s)")
+  fi
+}
+###
 
 parseArgs "$@"
 
@@ -109,6 +125,12 @@ case $OP in
 else
   echo "{color:red}-1 ${TASKNAME}{color}" >> $SUMMARYFILE
 fi
+checkForErrors
+if [[ $newErrs == 0 ]] ; then
+  echo "{color:green}+1 ${TASKNAME}{color}" >> $SUMMARYFILE
+else
+  echo "{color:red}-1 ${TASKNAME}{color}" >> $SUMMARYFILE
+fi
 for line in "${REPORT[@]}" ; do
   echo ".${line}" >> $SUMMARYFILE
 done

http://git-wip-us.apache.org/repos/asf/oozie/blob/2805ab66/core/src/main/java/org/apache/oozie/compression/CodecFactory.java
--
diff --git a/core/src/main/java/org/apache/oozie/compression/CodecFactory.java 
b/core/src/main/java/org/apache/oozie/compression/CodecFactory.java
index c0f906e..ef9fb04 100644
--- a/core/src/main/java/org/apache/oozie/compression/CodecFactory.java
+++ b/core/src/main/java/org/apache/oozie/compression/CodecFactory.java
@@ -43,7 +43,7 @@ public class CodecFactory {
 public static final String COMPRESSION_KEY_HEADER = "codec";
 public static final String UTF_8_ENCODING = "UTF-8";
 private static boolean isEnabled;
-private static XLog LOG = XLog.getLog(CodecFactory.class);;
+private static XLog LOG = XLog.getLog(CodecFactory.class);
 private static byte[] headerBytes;
 
 /**

http://git-wip-us.apache.org/repos/asf/oozie/blob/2805ab66/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 87de3f1..0208047 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1633,7 +1633,7 @@
 
 org.apache.maven.plugins
 maven-javadoc-plugin
-2.10.4
+3.0.0
 
 
${maven.javadoc.opts}

oozie git commit: OOZIE-2967 TestStatusTransitService.testBundleStatusCoordSubmitFails fails intermittently in Apache Oozie Core 5.0.0-SNAPSHOT (pbacsko)

2018-05-24 Thread pbacsko

Repository: oozie
Updated Branches:
  refs/heads/master 830f0b541 -> f9f6a87f8


OOZIE-2967 TestStatusTransitService.testBundleStatusCoordSubmitFails fails 
intermittently in Apache Oozie Core 5.0.0-SNAPSHOT (pbacsko)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/f9f6a87f
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/f9f6a87f
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/f9f6a87f

Branch: refs/heads/master
Commit: f9f6a87f864da4021cb5702d4133cab193eb7c16
Parents: 830f0b5
Author: Peter Bacsko 
Authored: Thu May 24 17:27:31 2018 +0200
Committer: Peter Bacsko 
Committed: Thu May 24 17:27:31 2018 +0200

--
 .../java/org/apache/oozie/service/TestStatusTransitService.java | 5 +
 release-log.txt | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/f9f6a87f/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
--
diff --git 
a/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java 
b/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
index 9315bad..019724e 100644
--- a/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
+++ b/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
@@ -1633,8 +1633,6 @@ public class TestStatusTransitService extends 
XDataTestCase {
 
 public void testBundleStatusCoordSubmitFails() throws Exception {
 
setSystemProperty(StatusTransitService.CONF_BACKWARD_SUPPORT_FOR_STATES_WITHOUT_ERROR,
 "false");
-services = new Services();
-services.init();
 BundleJobBean bundleJob = 
this.addRecordToBundleJobTable(Job.Status.RUNNING, false);
 
 final String bundleId = bundleJob.getId();
@@ -1644,14 +1642,13 @@ public class TestStatusTransitService extends 
XDataTestCase {
 // First try will kill the job.
 bundleJob = 
BundleJobQueryExecutor.getInstance().get(BundleJobQuery.GET_BUNDLE_JOB_STATUS, 
bundleId);
 assertEquals(Job.Status.FAILED, bundleJob.getStatus());
-sleep(1000);
+
 bundleJob.setStatus(Job.Status.RUNNING);
 
BundleJobQueryExecutor.getInstance().executeUpdate(BundleJobQuery.UPDATE_BUNDLE_JOB_STATUS_PENDING,
 bundleJob);
 runnable.run();
 // second try will change the status.
 bundleJob = 
BundleJobQueryExecutor.getInstance().get(BundleJobQuery.GET_BUNDLE_JOB_STATUS, 
bundleId);
 assertEquals(Job.Status.FAILED, bundleJob.getStatus());
-
 }
 
 public void testBundleRunningAfterCoordResume() throws Exception {

http://git-wip-us.apache.org/repos/asf/oozie/blob/f9f6a87f/release-log.txt
--
diff --git a/release-log.txt b/release-log.txt
index 96c3ce7..ce3f3cc 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.1.0 release (trunk - unreleased)
 
+OOZIE-2967 TestStatusTransitService.testBundleStatusCoordSubmitFails fails 
intermittently in Apache Oozie Core 5.0.0-SNAPSHOT (pbacsko)
 OOZIE-3238 Flaky test TestStatusTransitService#testBundleStatusTransitWithLock 
(pbacsko via gezapeti, andras.piros)
 OOZIE-3185 Upgrade org.apache.derby to 10.11.1.1 (PandaMonkey via andras.piros)
 OOZIE-2883 ProxyUserService: invalid configuration error message is misleading 
(yangfang via andras.piros)

oozie git commit: OOZIE-3238 Flaky test TestStatusTransitService#testBundleStatusTransitWithLock (pbacsko via gezapeti, andras.piros)

2018-05-24 Thread andras

Repository: oozie
Updated Branches:
  refs/heads/master 5334d0641 -> 830f0b541


OOZIE-3238 Flaky test TestStatusTransitService#testBundleStatusTransitWithLock 
(pbacsko via gezapeti, andras.piros)


Project: http://git-wip-us.apache.org/repos/asf/oozie/repo
Commit: http://git-wip-us.apache.org/repos/asf/oozie/commit/830f0b54
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/830f0b54
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/830f0b54

Branch: refs/heads/master
Commit: 830f0b5419be3bee527d4f1983782525e406e76c
Parents: 5334d06
Author: Andras Piros 
Authored: Thu May 24 11:46:31 2018 +0200
Committer: Andras Piros 
Committed: Thu May 24 11:46:31 2018 +0200

--
 .../oozie/service/TestStatusTransitService.java | 60 ++--
 release-log.txt |  1 +
 2 files changed, 31 insertions(+), 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/830f0b54/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
--
diff --git 
a/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java 
b/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
index a92cd87..9315bad 100644
--- a/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
+++ b/core/src/test/java/org/apache/oozie/service/TestStatusTransitService.java
@@ -19,6 +19,7 @@ package org.apache.oozie.service;
 
 import java.util.Date;
 
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.Path;
 import org.apache.oozie.BundleActionBean;
@@ -58,6 +59,8 @@ import org.apache.oozie.lock.LockToken;
 import org.apache.oozie.service.StatusTransitService.StatusTransitRunnable;
 import org.apache.oozie.test.XDataTestCase;
 import org.apache.oozie.util.DateUtils;
+import org.apache.oozie.util.LockerCoordinator;
+import org.apache.oozie.util.XLog;
 import org.apache.oozie.workflow.WorkflowApp;
 import org.apache.oozie.workflow.WorkflowInstance;
 import org.apache.oozie.workflow.lite.EndNodeDef;
@@ -1576,22 +1579,22 @@ public class TestStatusTransitService extends 
XDataTestCase {
 addRecordToBundleActionTable(bundleId, "action2-C", 0, 
Job.Status.RUNNING);
 addRecordToBundleActionTable(bundleId, "action3-C", 0, 
Job.Status.DONEWITHERROR);
 
-JobLock lockThread = new JobLock(jobId);
+LockerCoordinator coordinator = new LockerCoordinator();
+JobLock lockThread = new JobLock(jobId, coordinator);
 new Thread(lockThread).start();
+coordinator.awaitLockAcquire();
 
-sleep(1000);
 Runnable runnable = new StatusTransitRunnable();
 runnable.run();
 bundleJob = 
BundleJobQueryExecutor.getInstance().get(BundleJobQuery.GET_BUNDLE_JOB_STATUS, 
bundleId);
 assertEquals(Job.Status.RUNNING, bundleJob.getStatus());
-synchronized (lockThread) {
-lockThread.notifyAll();
-}
-sleep(1000);
+
+coordinator.signalLockerContinue();
+coordinator.awaitTermination();
+
 runnable.run();
 bundleJob = 
BundleJobQueryExecutor.getInstance().get(BundleJobQuery.GET_BUNDLE_JOB_STATUS, 
bundleId);
 assertEquals(Job.Status.RUNNINGWITHERROR, bundleJob.getStatus());
-
 }
 
 public void testCoordStatusTransitWithLock() throws Exception {
@@ -1610,21 +1613,22 @@ public class TestStatusTransitService extends 
XDataTestCase {
 "KILLED", 0);
 
 final CoordJobGetJPAExecutor coordJobGetCmd = new 
CoordJobGetJPAExecutor(coordJob.getId());
-JobLock lockThread = new JobLock(coordJob.getId());
+LockerCoordinator coordinator = new LockerCoordinator();
+JobLock lockThread = new JobLock(coordJob.getId(), coordinator);
 new Thread(lockThread).start();
+coordinator.awaitLockAcquire();
+
 Runnable runnable = new StatusTransitRunnable();
 runnable.run();
-sleep(1000);
 coordJob = jpaService.execute(coordJobGetCmd);
 assertEquals(CoordinatorJob.Status.RUNNING, coordJob.getStatus());
 
-synchronized (lockThread) {
-lockThread.notifyAll();
-}
+coordinator.signalLockerContinue();
+coordinator.awaitTermination();
+
 runnable.run();
 coordJob = jpaService.execute(coordJobGetCmd);
 assertEquals(CoordinatorJob.Status.RUNNINGWITHERROR, 
coordJob.getStatus());
-
 }
 
 public void testBundleStatusCoordSubmitFails() throws Exception {
@@ -1682,32 +1686,28 @@ public class TestStatusTransitService extends 
XDataTestCase {
 }
 
   static class JobLock implements Runnable {
-String jobId;
+private static XLog log

oozie git commit: OOZIE-3185 Upgrade org.apache.derby to 10.11.1.1 (PandaMonkey via andras.piros)

2018-05-24 Thread andras

Repository: oozie
Updated Branches:
  refs/heads/master b4bbc46f8 -> 5334d0641


OOZIE-3185 Upgrade org.apache.derby to 10.11.1.1 (PandaMonkey 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/5334d064
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/5334d064
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/5334d064

Branch: refs/heads/master
Commit: 5334d0641df2b7ec8c09ec91a2a485dbf2a42055
Parents: b4bbc46
Author: Andras Piros 
Authored: Thu May 24 11:33:45 2018 +0200
Committer: Andras Piros 
Committed: Thu May 24 11:33:45 2018 +0200

--
 pom.xml | 2 +-
 release-log.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/5334d064/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fd48857..87de3f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1304,7 +1304,7 @@
 
 org.apache.derby
 derby
-10.10.1.1
+10.11.1.1
 compile
 
 

http://git-wip-us.apache.org/repos/asf/oozie/blob/5334d064/release-log.txt
--
diff --git a/release-log.txt b/release-log.txt
index d211450..4e60878 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.1.0 release (trunk - unreleased)
 
+OOZIE-3185 Upgrade org.apache.derby to 10.11.1.1 (PandaMonkey via andras.piros)
 OOZIE-2883 ProxyUserService: invalid configuration error message is misleading 
(yangfang via andras.piros)
 OOZIE-3237 Flaky test TestZKLocksService#testWriteReadLockThreads (pbacsko via 
andras.piros)
 OOZIE-3251 Disable JMX for ActiveMQ in the tests (pbacsko)

oozie git commit: OOZIE-2883 ProxyUserService: invalid configuration error message is misleading (yangfang via andras.piros)

2018-05-24 Thread andras

Repository: oozie
Updated Branches:
  refs/heads/master 526dbd198 -> b4bbc46f8


OOZIE-2883 ProxyUserService: invalid configuration error message is misleading 
(yangfang 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/b4bbc46f
Tree: http://git-wip-us.apache.org/repos/asf/oozie/tree/b4bbc46f
Diff: http://git-wip-us.apache.org/repos/asf/oozie/diff/b4bbc46f

Branch: refs/heads/master
Commit: b4bbc46f884d3970c1448721ff539adfe308efb5
Parents: 526dbd1
Author: Andras Piros 
Authored: Thu May 24 09:56:56 2018 +0200
Committer: Andras Piros 
Committed: Thu May 24 09:56:56 2018 +0200

--
 .../src/main/java/org/apache/oozie/service/ProxyUserService.java | 4 ++--
 release-log.txt  | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/oozie/blob/b4bbc46f/core/src/main/java/org/apache/oozie/service/ProxyUserService.java
--
diff --git a/core/src/main/java/org/apache/oozie/service/ProxyUserService.java 
b/core/src/main/java/org/apache/oozie/service/ProxyUserService.java
index 39b5774..4bfd527 100644
--- a/core/src/main/java/org/apache/oozie/service/ProxyUserService.java
+++ b/core/src/main/java/org/apache/oozie/service/ProxyUserService.java
@@ -79,7 +79,7 @@ public class ProxyUserService implements Service {
 if (key.startsWith(CONF_PREFIX) && key.endsWith(GROUPS)) {
 String proxyUser = key.substring(0, key.lastIndexOf(GROUPS));
 if (services.getConf().get(proxyUser + HOSTS) == null) {
-throw new ServiceException(ErrorCode.E0551, CONF_PREFIX + 
proxyUser + HOSTS);
+throw new ServiceException(ErrorCode.E0551, proxyUser + 
HOSTS);
 }
 proxyUser = proxyUser.substring(CONF_PREFIX.length());
 String value = entry.getValue().trim();
@@ -93,7 +93,7 @@ public class ProxyUserService implements Service {
 if (key.startsWith(CONF_PREFIX) && key.endsWith(HOSTS)) {
 String proxyUser = key.substring(0, key.lastIndexOf(HOSTS));
 if (services.getConf().get(proxyUser + GROUPS) == null) {
-throw new ServiceException(ErrorCode.E0551, CONF_PREFIX + 
proxyUser + GROUPS);
+throw new ServiceException(ErrorCode.E0551, proxyUser + 
GROUPS);
 }
 proxyUser = proxyUser.substring(CONF_PREFIX.length());
 String value = entry.getValue().trim();

http://git-wip-us.apache.org/repos/asf/oozie/blob/b4bbc46f/release-log.txt
--
diff --git a/release-log.txt b/release-log.txt
index 8cb8c3d..d211450 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -1,5 +1,6 @@
 -- Oozie 5.1.0 release (trunk - unreleased)
 
+OOZIE-2883 ProxyUserService: invalid configuration error message is misleading 
(yangfang via andras.piros)
 OOZIE-3237 Flaky test TestZKLocksService#testWriteReadLockThreads (pbacsko via 
andras.piros)
 OOZIE-3251 Disable JMX for ActiveMQ in the tests (pbacsko)
 OOZIE-2826 Upgrade joda-time to 2.9.9 (dbist13 via andras.piros)

oozie git commit: OOZIE-3178 ./bin/mkdistro.sh -Papache-release fails due to javadoc errors (dbist13 via gezapeti)

oozie git commit: OOZIE-2967 TestStatusTransitService.testBundleStatusCoordSubmitFails fails intermittently in Apache Oozie Core 5.0.0-SNAPSHOT (pbacsko)

oozie git commit: OOZIE-3238 Flaky test TestStatusTransitService#testBundleStatusTransitWithLock (pbacsko via gezapeti, andras.piros)

oozie git commit: OOZIE-3185 Upgrade org.apache.derby to 10.11.1.1 (PandaMonkey via andras.piros)

oozie git commit: OOZIE-2883 ProxyUserService: invalid configuration error message is misleading (yangfang via andras.piros)

5 matches

Site Navigation

Mail list logo

Footer information