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

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


    from 4eff7353c6 Use "Tablet Availability" rather than "Hosting Goal" (#3969)
     add b90422cb7e set max files to fix ExternalCompaction4_IT test (#4205)
     add 9911fc1576 Merge remote-tracking branch 'upstream/2.1'
     add 1db892b00d Update export version to handle imports of files without 
fenced ranges (#4122)
     add 8bf0970c7f fixes issues related to deleting a compaction service 
(#4211)
     add 5fb05efd26 Merge branch '2.1'
     add 76e75294b8 Merge branch 'main' into elasticity

No new revisions were added by this update.

Summary of changes:
 core/pom.xml                                       |   2 -
 .../accumulo/core/metadata/StoredTabletFile.java   |  15 ++++
 .../core/metadata/StoredTabletFileTest.java        |  26 +++---
 pom.xml                                            |   2 +
 .../manager/tableOps/tableExport/ExportTable.java  |  10 ++-
 .../tableOps/tableExport/WriteExportFiles.java     |   2 +-
 .../manager/tableOps/tableImport/ImportTable.java  |   8 +-
 .../tableOps/tableImport/ImportedTableInfo.java    |   1 +
 .../tableImport/PopulateMetadataTable.java         |  16 +++-
 .../accumulo/manager/upgrade/Upgrader11to12.java   |  20 +----
 .../manager/upgrade/Upgrader11to12Test.java        |  25 +-----
 test/pom.xml                                       |  17 ++++
 .../org/apache/accumulo/test/ImportExportIT.java   |  53 +++++++++++++
 .../test/compaction/ExternalCompaction4_IT.java    |  12 +--
 .../accumulo/test/functional/CompactionIT.java     |  88 +++++++++++++++++++++
 test/src/main/resources/v2_import_test/README.md   |  78 ++++++++++++++++++
 .../main/resources/v2_import_test/data/A0000008.rf | Bin 0 -> 229 bytes
 .../main/resources/v2_import_test/data/A0000009.rf | Bin 0 -> 229 bytes
 .../main/resources/v2_import_test/data/A000000a.rf | Bin 0 -> 228 bytes
 .../main/resources/v2_import_test/data/A000000b.rf | Bin 0 -> 212 bytes
 .../main/resources/v2_import_test/data/distcp.txt  |   5 ++
 .../v2_import_test/data/exportMetadata.zip         | Bin 0 -> 934 bytes
 22 files changed, 313 insertions(+), 67 deletions(-)
 copy 
server/base/src/test/java/org/apache/accumulo/server/conf/util/ZooPropEditorTest.java
 => 
core/src/test/java/org/apache/accumulo/core/metadata/StoredTabletFileTest.java 
(55%)
 create mode 100644 test/src/main/resources/v2_import_test/README.md
 create mode 100644 test/src/main/resources/v2_import_test/data/A0000008.rf
 create mode 100644 test/src/main/resources/v2_import_test/data/A0000009.rf
 create mode 100644 test/src/main/resources/v2_import_test/data/A000000a.rf
 create mode 100644 test/src/main/resources/v2_import_test/data/A000000b.rf
 create mode 100644 test/src/main/resources/v2_import_test/data/distcp.txt
 create mode 100644 
test/src/main/resources/v2_import_test/data/exportMetadata.zip

Reply via email to