date:20151121

[5/6] accumulo git commit: Merge branch '1.6' into 1.7

2015-11-21 Thread elserj

Merge branch '1.6' into 1.7

Conflicts:
fate/src/main/java/org/apache/accumulo/fate/Fate.java


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

Branch: refs/heads/1.7
Commit: 1853d088e855a0c3f9345f6509c292814dcc61bb
Parents: 5947b42 e82c3f3
Author: Josh Elser 
Authored: Sat Nov 21 17:28:15 2015 -0500
Committer: Josh Elser 
Committed: Sat Nov 21 17:28:15 2015 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1853d088/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--
diff --cc fate/src/main/java/org/apache/accumulo/fate/Fate.java
index cf2ab73,52c7b2f..8a3aaf7
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@@ -41,7 -37,8 +41,8 @@@ public class Fate 
private static final String EXCEPTION_PROP = "exception";
private static final String RETURN_PROP = "return";
  
 -  final private static Logger log = Logger.getLogger(Fate.class);
 -  private final Logger runnerLog = Logger.getLogger(TransactionRunner.class);
 +  final private static Logger log = LoggerFactory.getLogger(Fate.class);
++  private final Logger runnerLog = 
LoggerFactory.getLogger(TransactionRunner.class);
  
private TStore store;
private T environment;

[2/6] accumulo git commit: ACCUMULO-4060 Handle uncaught exceptions in FATE repo runner threads.

2015-11-21 Thread elserj

ACCUMULO-4060 Handle uncaught exceptions in FATE repo runner threads.

Any RuntimeException propagated from the internals of the FATE
repo-runner threads will caught the thread to exit. This creates
a situation where the Master can be running but be unresponsive
to any pending FATE operations like creating a table.

Make sure that these exceptions are caught and suppressed to ensure
that FATE ops can always be handled while the master is running.


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

Branch: refs/heads/1.7
Commit: e82c3f3dab208478173e352635f87a96d72a38b2
Parents: 78522c4
Author: Josh Elser 
Authored: Sat Nov 21 16:53:11 2015 -0500
Committer: Josh Elser 
Committed: Sat Nov 21 16:58:26 2015 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e82c3f3d/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java 
b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
index 493d441..52c7b2f 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -38,6 +38,7 @@ public class Fate {
   private static final String RETURN_PROP = "return";
 
   final private static Logger log = Logger.getLogger(Fate.class);
+  private final Logger runnerLog = Logger.getLogger(TransactionRunner.class);
 
   private TStore store;
   private T environment;
@@ -91,6 +92,8 @@ public class Fate {
   }
 }
   }
+} catch (Exception e) {
+  runnerLog.error("Uncaught exception in FATE runner thread.", e);
 } finally {
   store.unreserve(tid, deferTime);
 }

[3/6] accumulo git commit: ACCUMULO-4060 Handle uncaught exceptions in FATE repo runner threads.

2015-11-21 Thread elserj

ACCUMULO-4060 Handle uncaught exceptions in FATE repo runner threads.

Any RuntimeException propagated from the internals of the FATE
repo-runner threads will caught the thread to exit. This creates
a situation where the Master can be running but be unresponsive
to any pending FATE operations like creating a table.

Make sure that these exceptions are caught and suppressed to ensure
that FATE ops can always be handled while the master is running.


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

Branch: refs/heads/master
Commit: e82c3f3dab208478173e352635f87a96d72a38b2
Parents: 78522c4
Author: Josh Elser 
Authored: Sat Nov 21 16:53:11 2015 -0500
Committer: Josh Elser 
Committed: Sat Nov 21 16:58:26 2015 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e82c3f3d/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java 
b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
index 493d441..52c7b2f 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -38,6 +38,7 @@ public class Fate {
   private static final String RETURN_PROP = "return";
 
   final private static Logger log = Logger.getLogger(Fate.class);
+  private final Logger runnerLog = Logger.getLogger(TransactionRunner.class);
 
   private TStore store;
   private T environment;
@@ -91,6 +92,8 @@ public class Fate {
   }
 }
   }
+} catch (Exception e) {
+  runnerLog.error("Uncaught exception in FATE runner thread.", e);
 } finally {
   store.unreserve(tid, deferTime);
 }

[1/6] accumulo git commit: ACCUMULO-4060 Handle uncaught exceptions in FATE repo runner threads.

2015-11-21 Thread elserj

Repository: accumulo
Updated Branches:
  refs/heads/1.6 78522c4cd -> e82c3f3da
  refs/heads/1.7 5947b4206 -> 1853d088e
  refs/heads/master 0e1da5a58 -> 2b6e68b6a


ACCUMULO-4060 Handle uncaught exceptions in FATE repo runner threads.

Any RuntimeException propagated from the internals of the FATE
repo-runner threads will caught the thread to exit. This creates
a situation where the Master can be running but be unresponsive
to any pending FATE operations like creating a table.

Make sure that these exceptions are caught and suppressed to ensure
that FATE ops can always be handled while the master is running.


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

Branch: refs/heads/1.6
Commit: e82c3f3dab208478173e352635f87a96d72a38b2
Parents: 78522c4
Author: Josh Elser 
Authored: Sat Nov 21 16:53:11 2015 -0500
Committer: Josh Elser 
Committed: Sat Nov 21 16:58:26 2015 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e82c3f3d/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java 
b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
index 493d441..52c7b2f 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -38,6 +38,7 @@ public class Fate {
   private static final String RETURN_PROP = "return";
 
   final private static Logger log = Logger.getLogger(Fate.class);
+  private final Logger runnerLog = Logger.getLogger(TransactionRunner.class);
 
   private TStore store;
   private T environment;
@@ -91,6 +92,8 @@ public class Fate {
   }
 }
   }
+} catch (Exception e) {
+  runnerLog.error("Uncaught exception in FATE runner thread.", e);
 } finally {
   store.unreserve(tid, deferTime);
 }

[6/6] accumulo git commit: Merge branch '1.7'

2015-11-21 Thread elserj

Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 2b6e68b6a6966c4dc80b422aa9e7a1766936b7da
Parents: 0e1da5a 1853d08
Author: Josh Elser 
Authored: Sat Nov 21 17:29:57 2015 -0500
Committer: Josh Elser 
Committed: Sat Nov 21 17:29:57 2015 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b6e68b6/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--

[4/6] accumulo git commit: Merge branch '1.6' into 1.7

2015-11-21 Thread elserj

Merge branch '1.6' into 1.7

Conflicts:
fate/src/main/java/org/apache/accumulo/fate/Fate.java


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

Branch: refs/heads/master
Commit: 1853d088e855a0c3f9345f6509c292814dcc61bb
Parents: 5947b42 e82c3f3
Author: Josh Elser 
Authored: Sat Nov 21 17:28:15 2015 -0500
Committer: Josh Elser 
Committed: Sat Nov 21 17:28:15 2015 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1853d088/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--
diff --cc fate/src/main/java/org/apache/accumulo/fate/Fate.java
index cf2ab73,52c7b2f..8a3aaf7
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@@ -41,7 -37,8 +41,8 @@@ public class Fate 
private static final String EXCEPTION_PROP = "exception";
private static final String RETURN_PROP = "return";
  
 -  final private static Logger log = Logger.getLogger(Fate.class);
 -  private final Logger runnerLog = Logger.getLogger(TransactionRunner.class);
 +  final private static Logger log = LoggerFactory.getLogger(Fate.class);
++  private final Logger runnerLog = 
LoggerFactory.getLogger(TransactionRunner.class);
  
private TStore store;
private T environment;

[5/6] accumulo git commit: Merge branch '1.6' into 1.7

[2/6] accumulo git commit: ACCUMULO-4060 Handle uncaught exceptions in FATE repo runner threads.

[3/6] accumulo git commit: ACCUMULO-4060 Handle uncaught exceptions in FATE repo runner threads.

[1/6] accumulo git commit: ACCUMULO-4060 Handle uncaught exceptions in FATE repo runner threads.

[6/6] accumulo git commit: Merge branch '1.7'

[4/6] accumulo git commit: Merge branch '1.6' into 1.7

6 matches

Site Navigation

Mail list logo

Footer information