ctubbsii commented on code in PR #5888:
URL: https://github.com/apache/accumulo/pull/5888#discussion_r2360783933
##########
core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java:
##########
@@ -214,6 +215,14 @@ public static SiteConfiguration auto() {
private SiteConfiguration(Map<String,String> config) {
ConfigCheckUtil.validate(config.entrySet(), "site config");
+ var tableProps =
+ config.keySet().stream().filter(prop ->
prop.startsWith(Property.TABLE_PREFIX.getKey()))
+ .collect(Collectors.toSet());
+ if (!tableProps.isEmpty()) {
+ log.warn(
+ "Setting table properties in accumulo.properties file or with -o
option is deprecated, saw:{}",
Review Comment:
```suggestion
"Setting table properties in accumulo.properties file or with -o
option is deprecated, saw: {}",
```
##########
server/base/src/main/java/org/apache/accumulo/server/util/UpgradeUtil.java:
##########
@@ -85,6 +120,25 @@ public void execute(String[] args) throws Exception {
ZooReaderWriter zoo = new ZooReaderWriter(siteConf);
if (opts.prepare) {
+ SortedMap<String,String> tablePropsInSite = new TreeMap<>();
+ // get table props in site conf excluding default config
+ siteConf.getProperties(tablePropsInSite,
+ key -> key.startsWith(Property.TABLE_PREFIX.getKey()), false);
+
+ if (!tablePropsInSite.isEmpty()) {
+ LOG.warn("Saw table properties in site configuration : {} ",
tablePropsInSite.keySet());
Review Comment:
This message and the subsequent exception message could be updated to refer
to `accumulo.properties` instead of "site" as well.
--
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]
