[accumulo] branch main updated (94f4009429 -> 0f65561e98)

[ct...@apache.org]

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

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


    from 94f4009429 remove upgrade code for versions before 2.1 (#3160)
     add 401270ada6 Enable users to provide per-volume Hadoop Filesystem overrides (#3180)
     new 0f65561e98 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:
 .../org/apache/accumulo/core/conf/Property.java    |  10 ++
 .../miniclusterImpl/MiniAccumuloClusterImpl.java   |   5 +
 .../miniclusterImpl/MiniAccumuloConfigImpl.java    |  24 ++++
 .../accumulo/server/fs/VolumeManagerImpl.java      |  60 ++++++++-
 .../accumulo/server/fs/VolumeManagerImplTest.java  | 137 +++++++++++++++++++
 .../org/apache/accumulo/test/VolumeManagerIT.java  | 147 +++++++++++++++++++++
 6 files changed, 381 insertions(+), 2 deletions(-)
 create mode 100644 test/src/main/java/org/apache/accumulo/test/VolumeManagerIT.java

[accumulo] 01/01: Merge branch '2.1'

[ct...@apache.org]

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

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

commit 0f65561e98610d5ea36d8d46a33f98694e993367
Merge: 94f4009429 401270ada6
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Thu Feb 9 17:58:08 2023 -0500

    Merge branch '2.1'
    
    Resolve conflicts of #3180 and #3074 in MiniAccumuloClusterImpl to merge
    PR #3180 into the main branch

 .../org/apache/accumulo/core/conf/Property.java    |  10 ++
 .../miniclusterImpl/MiniAccumuloClusterImpl.java   |   5 +
 .../miniclusterImpl/MiniAccumuloConfigImpl.java    |  24 ++++
 .../accumulo/server/fs/VolumeManagerImpl.java      |  60 ++++++++-
 .../accumulo/server/fs/VolumeManagerImplTest.java  | 137 +++++++++++++++++++
 .../org/apache/accumulo/test/VolumeManagerIT.java  | 147 +++++++++++++++++++++
 6 files changed, 381 insertions(+), 2 deletions(-)

diff --cc minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
index 709090b5f6,a5f8b08b08..539ddf3cd4
--- a/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/miniclusterImpl/MiniAccumuloClusterImpl.java
@@@ -217,6 -219,18 +217,11 @@@ public class MiniAccumuloClusterImpl im
        dfsUri = "file:///";
      }
  
+     // Perform any modifications to the site config that need to happen
+     // after the instance volumes are set, and before the config is
+     // written out and MAC started.
+     config.preStartConfigUpdate();
+ 
 -    File clientConfFile = config.getClientConfFile();
 -    // Write only the properties that correspond to ClientConfiguration properties
 -    writeConfigProperties(clientConfFile,
 -        Maps.filterEntries(config.getSiteConfig(),
 -            v -> org.apache.accumulo.core.client.ClientConfiguration.ClientProperty
 -                .getPropertyByKey(v.getKey()) != null));
 -
      Map<String,String> clientProps = config.getClientProps();
      clientProps.put(ClientProperty.INSTANCE_ZOOKEEPERS.getKey(), config.getZooKeepers());
      clientProps.put(ClientProperty.INSTANCE_NAME.getKey(), config.getInstanceName());