[accumulo] 01/01: Merge branch 'main' into elasticity

[dlmarion]

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

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

commit f723d95b5a7d9809d196d6e528d1b874c205617c
Merge: ec5d51803f cfe5738f8f
Author: Dave Marion <dlmar...@apache.org>
AuthorDate: Mon Jul 17 11:25:12 2023 +0000

    Merge branch 'main' into elasticity

 .../server/constraints/MetadataConstraints.java    |  14 +--
 .../accumulo/tserver/session/SessionManager.java   |   6 +-
 .../accumulo/tserver/tablet/ScanDataSource.java    |  11 +++
 .../org/apache/accumulo/tserver/tablet/Tablet.java |  11 +++
 .../tserver/session/SessionManagerTest.java        | 109 +++++++++++++++++++++
 5 files changed, 143 insertions(+), 8 deletions(-)

diff --cc 
server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
index 86c28ce911,622e58cfc8..688a9680e1
--- 
a/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/constraints/MetadataConstraints.java
@@@ -238,33 -229,11 +238,33 @@@ public class MetadataConstraints implem
            violations = addViolation(violations, 1);
          }
        } else if (columnFamily.equals(ScanFileColumnFamily.NAME)) {
-         violations =
-             validateDataFilePath(violations, new 
String(columnUpdate.getColumnQualifier(), UTF_8));
+         violations = validateDataFileMetadata(violations,
+             new String(columnUpdate.getColumnQualifier(), UTF_8));
 +      } else if (HostingColumnFamily.GOAL_COLUMN.equals(columnFamily, 
columnQualifier)) {
 +        try {
 +          TabletHostingGoalUtil.fromValue(new Value(columnUpdate.getValue()));
 +        } catch (IllegalArgumentException e) {
 +          violations = addViolation(violations, 10);
 +        }
 +      } else if (ServerColumnFamily.OPID_COLUMN.equals(columnFamily, 
columnQualifier)) {
 +        try {
 +          TabletOperationId.validate(new String(columnUpdate.getValue(), 
UTF_8));
 +        } catch (IllegalArgumentException e) {
 +          violations = addViolation(violations, 9);
 +        }
 +      } else if (ServerColumnFamily.SELECTED_COLUMN.equals(columnFamily, 
columnQualifier)) {
 +        try {
 +          SelectedFiles.from(new String(columnUpdate.getValue(), UTF_8));
 +        } catch (RuntimeException e) {
 +          violations = addViolation(violations, 11);
 +        }
 +      } else if (CompactedColumnFamily.NAME.equals(columnFamily)) {
 +        if (!FateTxId.isFormatedTid(columnQualifier.toString())) {
 +          violations = addViolation(violations, 13);
 +        }
        } else if (columnFamily.equals(BulkFileColumnFamily.NAME)) {
          if (!columnUpdate.isDeleted() && !checkedBulk) {
-           violations = validateDataFilePath(violations,
+           violations = validateDataFileMetadata(violations,
                new String(columnUpdate.getColumnQualifier(), UTF_8));
  
            // splits, which also write the time reference, are allowed to 
write this reference even