keith-turner commented on code in PR #5908:
URL: https://github.com/apache/accumulo/pull/5908#discussion_r2368971291
##########
server/manager/src/main/java/org/apache/accumulo/manager/upgrade/Upgrader11to12.java:
##########
@@ -934,6 +934,16 @@ void moveTableProperties(ServerContext context) {
final Map<String,String> nsPropAdditions = new HashMap<>();
for (Entry<String,String> e : sysTableProps.entrySet()) {
+
+ // Don't move iterators or constraints from the system configuration
+ // to the system namespace. This will affect the root and metadata
+ // tables.
+ if (ns.equals(Namespace.ACCUMULO.name())
+ &&
(e.getKey().startsWith(Property.TABLE_ITERATOR_PREFIX.getKey())
+ ||
e.getKey().startsWith(Property.TABLE_CONSTRAINT_PREFIX.getKey()))) {
+ continue;
Review Comment:
Could add a debug or info log here mentioning that the prop is not being
moved to the accumulo namespace because its an iterator or constraint.
##########
server/manager/src/test/java/org/apache/accumulo/manager/upgrade/Upgrader11to12Test.java:
##########
@@ -599,17 +599,25 @@ public void testMoveTableProperties() throws Exception {
sysProps.put(Property.TABLE_BLOOM_ENABLED.getKey(), "true");
sysProps.put(Property.TABLE_BLOCKCACHE_ENABLED.getKey(), "true");
sysProps.put(Property.TABLE_CLASSLOADER_CONTEXT.getKey(), "sysContext");
+ sysProps.put(Property.TABLE_ITERATOR_PREFIX.getKey() + "test",
"iteratorProperty");
Review Comment:
Could also test a constraint property. Ran this test w/ coverage and
noticed it was not hitting that case.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
