You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2017/11/30 19:19:17 UTC
[accumulo] branch master updated (03139a3 -> 41dcabb)
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 03139a3 ACCUMULO-4740 Enable GCM mode for crypto
add e738351 ACCUMULO-4546 Create default log message for table error (#327)
add 238e471 ACCUMULO-4546 Fix StringUtils import
add d4722bf Merge branch '1.7' into 1.8
new 41dcabb Merge branch '1.8'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../accumulo/server/tables/TableManager.java | 20 ++++++-
.../IllegalTableTransitionExceptionTest.java | 68 ++++++++++++++++++++++
2 files changed, 87 insertions(+), 1 deletion(-)
create mode 100644 server/base/src/test/java/org/apache/accumulo/server/tables/IllegalTableTransitionExceptionTest.java
--
To stop receiving notification emails like this one, please contact
['"commits@accumulo.apache.org" <co...@accumulo.apache.org>'].
[accumulo] 01/01: Merge branch '1.8'
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 41dcabb14772b192f32b1fa67f770378c4ea068f
Merge: 03139a3 d4722bf
Author: Mike Miller <mm...@apache.org>
AuthorDate: Thu Nov 30 14:18:48 2017 -0500
Merge branch '1.8'
Conflicts:
server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
.../accumulo/server/tables/TableManager.java | 20 ++++++-
.../IllegalTableTransitionExceptionTest.java | 68 ++++++++++++++++++++++
2 files changed, 87 insertions(+), 1 deletion(-)
diff --cc server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
index cfc5c90,0777f3f..74c4f62
--- a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
@@@ -125,9 -142,14 +138,14 @@@ public class TableManager
return newState;
}
+ @Override
+ public String getMessage() {
+ return message;
+ }
+
}
- public synchronized void transitionTableState(final String tableId, final TableState newState) {
+ public synchronized void transitionTableState(final Table.ID tableId, final TableState newState) {
String statePath = ZooUtil.getRoot(HdfsZooInstance.getInstance()) + Constants.ZTABLES + "/" + tableId + Constants.ZTABLE_STATE;
try {
@@@ -162,8 -184,8 +180,8 @@@
}
});
} catch (Exception e) {
- // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compability
+ // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
- log.error("FATAL Failed to transition table to state " + newState);
+ log.error("FATAL Failed to transition table to state {}", newState);
throw new RuntimeException(e);
}
}
--
To stop receiving notification emails like this one, please contact
"commits@accumulo.apache.org" <co...@accumulo.apache.org>.