(accumulo) 01/02: Merge branch '3.1'

[dlmarion]

This is an automated email from the ASF dual-hosted git repository.

dlmarion pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/accumulo.git

commit e79a3198f62021147a5da93411a338073021b400
Merge: c648152d2a af2ca87aa4
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Wed Nov 20 13:39:02 2024 +0000

    Merge branch '3.1'

 .../src/main/java/org/apache/accumulo/core/conf/Property.java | 10 +++++++++-
 .../src/main/java/org/apache/accumulo/monitor/Monitor.java    | 11 +++++++++++
 .../accumulo/monitor/rest/tservers/TabletServerResource.java  |  3 ++-
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --cc server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index cb2b4e8a4c,0c1b780bbc..e8131e894a
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@@ -125,8 -124,14 +126,14 @@@ public class Monitor extends AbstractSe
    }
  
    Monitor(ConfigOpts opts, String[] args) {
 -    super("monitor", opts, args);
 +    super("monitor", opts, ServerContext::new, args);
      START_TIME = System.currentTimeMillis();
+     // Using site configuration on purpose. We want to get the value from
+     // accumulo.properties file local to the Monitor. We don't want to
+     // enable someone to change this property dynamically and expose
+     // information.
+     obfuscateExtents =
+         
getContext().getSiteConfiguration().getBoolean(Property.MONITOR_OBFUSCATE_EXTENTS);
    }
  
    private final AtomicLong lastRecalc = new AtomicLong(0L);