You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2026/01/14 23:19:47 UTC
(accumulo) branch main updated (15e90019d0 -> c4a6d67186)
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
from 15e90019d0 Improve timekeeping code (#6041)
add f08e3ca1af Fix collection concurrency (#6052)
add 6f9aba449c log exception on failure set table prop (#6057)
new c4a6d67186 Merge branch '2.1'
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:
.../core/clientImpl/TabletServerBatchReaderIterator.java | 7 ++-----
.../accumulo/core/clientImpl/TabletServerBatchWriter.java | 7 ++-----
.../java/org/apache/accumulo/core/conf/ConfigurationCopy.java | 10 +++++-----
.../accumulo/core/iteratorsImpl/system/StatsIterator.java | 4 +---
.../org/apache/accumulo/server/compaction/FileCompactor.java | 6 +-----
.../apache/accumulo/manager/ManagerClientServiceHandler.java | 6 ++++--
6 files changed, 15 insertions(+), 25 deletions(-)
(accumulo) 01/01: Merge branch '2.1'
Posted by kt...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit c4a6d67186aabc8070f8199cfe5bc22b71c45480
Merge: 15e90019d0 6f9aba449c
Author: Keith Turner <kt...@apache.org>
AuthorDate: Wed Jan 14 23:19:02 2026 +0000
Merge branch '2.1'
.../core/clientImpl/TabletServerBatchReaderIterator.java | 7 ++-----
.../accumulo/core/clientImpl/TabletServerBatchWriter.java | 7 ++-----
.../java/org/apache/accumulo/core/conf/ConfigurationCopy.java | 10 +++++-----
.../accumulo/core/iteratorsImpl/system/StatsIterator.java | 4 +---
.../org/apache/accumulo/server/compaction/FileCompactor.java | 6 +-----
.../apache/accumulo/manager/ManagerClientServiceHandler.java | 6 ++++--
6 files changed, 15 insertions(+), 25 deletions(-)
diff --cc server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
index 92ef131435,57efa11cd7..40da82d460
--- a/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/ManagerClientServiceHandler.java
@@@ -651,14 -577,17 +651,16 @@@ public class ManagerClientServiceHandle
if (value == null || value.isEmpty()) {
value = "";
}
- PropUtil.setProperties(manager.getContext(), TablePropKey.of(manager.getContext(), tableId),
- Map.of(property, value));
+ PropUtil.setProperties(context, TablePropKey.of(tableId), Map.of(property, value));
+ } else {
+ throw new UnsupportedOperationException("table operation:" + op.name());
}
} catch (IllegalStateException ex) {
- log.warn("Invalid table property, tried to set: tableId: " + tableId.canonical() + " to: "
- + property + "=" + value);
+ log.warn("Invalid table property, tried to {}: tableId: {} to: {}={}", op.name(),
+ tableId.canonical(), property, value, ex);
// race condition... table no longer exists? This call will throw an exception if the table
// was deleted:
- ClientServiceHandler.checkTableId(manager.getContext(), tableName, op);
+ ClientServiceHandler.checkTableId(context, tableName, op);
throw new ThriftTableOperationException(tableId.canonical(), tableName, op,
TableOperationExceptionType.OTHER, "Invalid table property, tried to set: tableId: "
+ tableId.canonical() + " to: " + property + "=" + value);