[accumulo] branch no-chop-merge updated (c4518402f0 -> 805df4d4b2)
This is an automated email from the ASF dual-hosted git repository. cshannon pushed a change to branch no-chop-merge in repository https://gitbox.apache.org/repos/asf/accumulo.git from c4518402f0 Merge branch 'main' into no-chop-merge add 12898a36b7 Roll up the manager's safe mode status indicator to the nav bar (#3561) add aaec35fcf8 normalize metric labels and structure (#3600) add 313238b5e8 Roll up the manager's safe mode status indicator to the nav bar (#3561) add 04262c07d7 Merge branch '2.1' add b59dfa9564 Add CI check to detect Thrift changes (#3362) add a07499e07a Minor POM quality updates (#3419) add 4f5d358dcc More build updates to reduce warnings (#3426) add 497d741f7a Update datasketches-java to 4.0.0 (#3457) add c1ed35411b Bump snappy-java from 1.1.9.1 to 1.1.10.1 (#3498) add c6024b2b62 Bump guava from 31.1-jre to 32.0.0-jre (#3497) add 9e8b59caa1 Update parent POM to 30 and remove contrib dir (#3550) add c38c10fec1 Bump ZooKeeper patch version add 67ca64eeb5 Merge branch '2.1' add 12c0b7b018 Fix bad assert statements in tests (#3691) add c99f708127 Merge branch '2.1' add 38c261d123 consolidate y/n prompts in shell (#3684) add 57903f4636 Merge branch '2.1' add 805df4d4b2 Merge branch 'main' into no-chop-merge No new revisions were added by this update. Summary of changes: .../accumulo/core/metrics/MetricsProducer.java | 31 +-- .../its/mapreduce/AccumuloInputFormatIT.java | 2 +- pom.xml| 2 +- .../apache/accumulo/monitor/resources/js/navbar.js | 230 ++--- .../tserver/metrics/TabletServerScanMetrics.java | 2 +- .../main/java/org/apache/accumulo/shell/Shell.java | 21 ++ .../accumulo/shell/commands/ConfigCommand.java | 32 ++- .../shell/commands/DeleteNamespaceCommand.java | 14 +- .../accumulo/shell/commands/DropUserCommand.java | 9 +- .../accumulo/shell/commands/MergeCommand.java | 11 +- .../accumulo/shell/commands/TableOperation.java| 24 +-- .../shell/commands/DropUserCommandTest.java| 11 +- .../apache/accumulo/test/functional/TabletIT.java | 3 +- .../org/apache/accumulo/test/shell/ShellIT.java| 10 +- 14 files changed, 231 insertions(+), 171 deletions(-)
[accumulo-website] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/accumulo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 71a4985a Automatic Site Publish by Buildbot 71a4985a is described below commit 71a4985a73ff025d45e782aad19b0c65da1eca64 Author: buildbot AuthorDate: Mon Aug 14 20:10:38 2023 + Automatic Site Publish by Buildbot --- output/feed.xml | 4 ++-- output/release/accumulo-3.0.0/index.html | 16 output/search_data.json | 2 +- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/output/feed.xml b/output/feed.xml index dc5269a7..32dfe6dd 100644 --- a/output/feed.xml +++ b/output/feed.xml @@ -6,8 +6,8 @@ https://accumulo.apache.org/ https://accumulo.apache.org/feed.xml; rel="self" type="application/rss+xml"/> -Mon, 14 Aug 2023 20:09:04 + -Mon, 14 Aug 2023 20:09:04 + +Mon, 14 Aug 2023 20:10:32 + +Mon, 14 Aug 2023 20:10:32 + Jekyll v4.3.2 diff --git a/output/release/accumulo-3.0.0/index.html b/output/release/accumulo-3.0.0/index.html index e5302cd9..0c599b37 100644 --- a/output/release/accumulo-3.0.0/index.html +++ b/output/release/accumulo-3.0.0/index.html @@ -181,12 +181,28 @@ files or supplied on a per-process basis using the https://github.com/apache/accumulo/issues/3080;>#3080. TODO - Need to discuss what happens to the replication table +BulkImport v1 was removed + +BulkImport v1 was removed in 3.0.0 (https://github.com/apache/accumulo/issues/3313;>#3313). Bulk Import v1 users should reference the +2.0.0 https://accumulo.apache.org/release/accumulo-2.0.0/#new-bulk-import-api;>bulk import release notes. + FileSystem monitor will no longer stop the TabletServer In https://github.com/apache/accumulo/issues/1328;>#1328 the tserver.monitor.fs property has been marked as deprecated and the background thread in the TabletServer was modified to not halt the TabletServer when one of the local disks becomes read-only. +GarbageCollectionLogger renamed to LowMemoryDetector, is no longer passive + +The GarbageCollectionLogger would run in a Thread in the server components every 5 seconds +and print a message to the log when the amount of free memory was less than 5% of the heap. +https://github.com/apache/accumulo/issues/3161;>#3161 renamed the class to LowMemoryDetector, adds new properties for the threshold, +interval, and passivity. When operating in a passive mode, the LowMemoryDetector will log a +message just like its predecessor. See the new GENERAL_LOW_MEM_*_PROTECTION properties for a +description of the behavior change when these properties are enabled. https://github.com/apache/accumulo/issues/3288;>#3288 added a +new metric, accumulo.detected.low.memory, that reports a value of 1 when the server is low on +memory. + Other Notable Changes diff --git a/output/search_data.json b/output/search_data.json index c4ee46b8..bceface5 100644 --- a/output/search_data.json +++ b/output/search_data.json @@ -342,7 +342,7 @@ "release-accumulo-3-0-0": { "title": "Apache Accumulo 3.0.0", - "content": "Apache Accumulo 3.0.0 contains significant changes from 2.1 and earlier versions.Notable ChangesArguments to server processes were removed in favor of configuration propertiesThe server process arguments (-a, -g, -q, etc.) were removed in #3192in favor of configuration properties that can be specified in the Accumulo configurationfiles or supplied on a per-process basis using the -o argument.Support for the replication feature has been removedThe replication feature was [...] + "content": "Apache Accumulo 3.0.0 contains significant changes from 2.1 and earlier versions.Notable ChangesArguments to server processes were removed in favor of configuration propertiesThe server process arguments (-a, -g, -q, etc.) were removed in #3192in favor of configuration properties that can be specified in the Accumulo configurationfiles or supplied on a per-process basis using the -o argument.Support for the replication feature has been removedThe replication feature was [...] "url": " /release/accumulo-3.0.0/", "categories": "release" }
[accumulo-website] branch main updated: Updates to 3.0.0 relnotes (#392)
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-website.git The following commit(s) were added to refs/heads/main by this push: new 68d338e6 Updates to 3.0.0 relnotes (#392) 68d338e6 is described below commit 68d338e62d253eebcfa8b87ee9f18e3c5580f9f4 Author: Dave Marion AuthorDate: Mon Aug 14 16:10:16 2023 -0400 Updates to 3.0.0 relnotes (#392) --- _posts/release/2023-02-14-accumulo-3.0.0.md | 17 + 1 file changed, 17 insertions(+) diff --git a/_posts/release/2023-02-14-accumulo-3.0.0.md b/_posts/release/2023-02-14-accumulo-3.0.0.md index db5b49d5..2970364c 100644 --- a/_posts/release/2023-02-14-accumulo-3.0.0.md +++ b/_posts/release/2023-02-14-accumulo-3.0.0.md @@ -19,12 +19,28 @@ files or supplied on a per-process basis using the `-o` argument. The replication feature was marked as deprecated in 2.0.0 and was removed in {% ghi 3080 %}. TODO - Need to discuss what happens to the replication table +### BulkImport v1 was removed + +BulkImport v1 was removed in 3.0.0 ({% ghi 3313 %}). Bulk Import v1 users should reference the +2.0.0 [bulk import release notes]. + ### FileSystem monitor will no longer stop the TabletServer In {% ghi 1328 %} the `tserver.monitor.fs` property has been marked as deprecated and the background thread in the TabletServer was modified to *not* halt the TabletServer when one of the local disks becomes read-only. +### GarbageCollectionLogger renamed to LowMemoryDetector, is no longer passive + +The GarbageCollectionLogger would run in a Thread in the server components every 5 seconds +and print a message to the log when the amount of free memory was less than 5% of the heap. +{% ghi 3161 %} renamed the class to LowMemoryDetector, adds new properties for the threshold, +interval, and passivity. When operating in a passive mode, the LowMemoryDetector will log a +message just like its predecessor. See the new GENERAL_LOW_MEM_*_PROTECTION properties for a +description of the behavior change when these properties are enabled. {% ghi 3288 %} added a +new metric, accumulo.detected.low.memory, that reports a value of 1 when the server is low on +memory. + ### Other Notable Changes * {% ghi 3189 %} Standardized server lock data structure in ZooKeeper @@ -48,3 +64,4 @@ View the [Upgrading Accumulo documentation][upgrade] for guidance. [#634]: https://github.com/apache/accumulo/issues/634 [upgrade]: /docs/2.x/administration/upgrading [website-repo]: https://github.com/apache/accumulo-website +[bulk import release notes]: https://accumulo.apache.org/release/accumulo-2.0.0/#new-bulk-import-api
[accumulo-website] branch asf-site updated: Automatic Site Publish by Buildbot
This is an automated email from the ASF dual-hosted git repository. git-site-role pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/accumulo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new 4beb139f Automatic Site Publish by Buildbot 4beb139f is described below commit 4beb139fcec05ca095895d7042f8f24fe1c76fc6 Author: buildbot AuthorDate: Mon Aug 14 20:09:10 2023 + Automatic Site Publish by Buildbot --- output/feed.xml| 4 +- output/release/accumulo-2.1.1/index.html | 4 +- .../{accumulo-2.1.1 => accumulo-2.1.2}/index.html | 162 ++--- output/release/accumulo-3.0.0/index.html | 4 +- output/release/index.html | 11 ++ output/search_data.json| 8 + 6 files changed, 104 insertions(+), 89 deletions(-) diff --git a/output/feed.xml b/output/feed.xml index 23601010..dc5269a7 100644 --- a/output/feed.xml +++ b/output/feed.xml @@ -6,8 +6,8 @@ https://accumulo.apache.org/ https://accumulo.apache.org/feed.xml; rel="self" type="application/rss+xml"/> -Mon, 07 Aug 2023 12:33:32 + -Mon, 07 Aug 2023 12:33:32 + +Mon, 14 Aug 2023 20:09:04 + +Mon, 14 Aug 2023 20:09:04 + Jekyll v4.3.2 diff --git a/output/release/accumulo-2.1.1/index.html b/output/release/accumulo-2.1.1/index.html index 253ab687..3cf62e97 100644 --- a/output/release/accumulo-2.1.1/index.html +++ b/output/release/accumulo-2.1.1/index.html @@ -151,7 +151,7 @@ -Apache Accumulo 3.0.0 +Apache Accumulo 2.1.2 @@ -282,7 +282,7 @@ were still receiving assignments -Apache Accumulo 3.0.0 +Apache Accumulo 2.1.2 diff --git a/output/release/accumulo-2.1.1/index.html b/output/release/accumulo-2.1.2/index.html similarity index 59% copy from output/release/accumulo-2.1.1/index.html copy to output/release/accumulo-2.1.2/index.html index 253ab687..1ec3bb3c 100644 --- a/output/release/accumulo-2.1.1/index.html +++ b/output/release/accumulo-2.1.2/index.html @@ -25,7 +25,7 @@ https://cdn.datatables.net/v/bs/jq-2.2.3/dt-1.10.12/datatables.min.css;> -Apache Accumulo 2.1.1 +Apache Accumulo 2.1.2 https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.min.js" integrity="sha256-BbhdlvQf/xTY9gja0Dq3HiwQF8LaCRTXxZKRutelT44=" crossorigin="anonymous"> https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"> @@ -140,14 +140,14 @@ - Apache Accumulo 2.1.1 + Apache Accumulo 2.1.2 -19 Jun 2023 +14 Aug 2023 -Apache Accumulo 2.1.0 +Apache Accumulo 2.1.1 @@ -156,6 +156,11 @@ + + These are draft release notes for a future release of Accumulo! + Please view the latest release notes. + + @@ -165,111 +170,102 @@ About -Apache Accumulo 2.1.1 is a patch release of the 2.1.0 LTM line. It contains -many bug fixes and minor enhancements, including a critical fix. This version -supersedes 2.1.0. Users upgrading to 2.1 should upgrade directly to this -version instead of 2.1.0. +Apache Accumulo 2.1.2 is a patch release of the 2.1.0 LTM line. It contains +bug fixes and minor enhancements. This version supersedes 2.1.1. Users +upgrading to 2.1 should upgrade directly to this version instead of 2.1.1. -Included here are some highlights of the most interesting bugs and features -fixed in 2.1.1. Several trivial bugs were also fixed that related to the -presentation of information on the monitor, or to avoid spammy/excessive -logging, but are too numerous to list here. For the full set of bug fixes, -please see the commit history or issue tracker. +Included here are some highlights of the most interesting bugs fixed and features +added in 2.1.2. For the full set of bug fixes, please see the commit history +or issue tracker. NOTE: This 2.1 release also includes any applicable bug fixes and improvements that occurred in 1.10.3 and earlier. -Critical Fixes - - - https://www.cve.org/CVERecord?id=CVE-2023-34340;>CVE-2023-34340 Fixed a critical issue that improperly allowed a user under -some conditions to authenticate to Accumulo using an invalid password. - - Notable Improvements -Improvements that add capabilities: - - - https://github.com/apache/accumulo/issues/3180;>#3180 Enable users to provide per-volume Hadoop Filesystem -configuration overrides via the Accumulo configuration. Hadoop Filesystem -objects are configured by the standard Hadoop mechanisms (default -configuration, core-site.xml, hdfs-site.xml, etc.), but these configuration -files don’t allow for the same property to be specified with
[accumulo-website] branch main updated: Started release notes for 2.1.2 (#391)
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-website.git The following commit(s) were added to refs/heads/main by this push: new cf3e4b2a Started release notes for 2.1.2 (#391) cf3e4b2a is described below commit cf3e4b2a193b022dffc38ac2e380e8765c4a5a5c Author: Dave Marion AuthorDate: Mon Aug 14 16:08:47 2023 -0400 Started release notes for 2.1.2 (#391) Co-authored-by: Dom G. Co-authored-by: Christopher Tubbs --- _posts/release/2023-08-14-accumulo-2.1.2.md | 85 + 1 file changed, 85 insertions(+) diff --git a/_posts/release/2023-08-14-accumulo-2.1.2.md b/_posts/release/2023-08-14-accumulo-2.1.2.md new file mode 100644 index ..d0f2ee88 --- /dev/null +++ b/_posts/release/2023-08-14-accumulo-2.1.2.md @@ -0,0 +1,85 @@ +--- +title: Apache Accumulo 2.1.2 +sortableversion: '02.01.02' +LTM: true +draft: true +--- +## About + +Apache Accumulo 2.1.2 is a patch release of the 2.1.0 LTM line. It contains +bug fixes and minor enhancements. This version supersedes 2.1.1. Users +upgrading to 2.1 should upgrade directly to this version instead of 2.1.1. + +Included here are some highlights of the most interesting bugs fixed and features +added in 2.1.2. For the full set of bug fixes, please see the commit history +or issue tracker. + +NOTE: This 2.1 release also includes any applicable bug fixes and improvements +that occurred in 1.10.3 and earlier. + +### Notable Improvements + +Improvements that affect performance: + +* {% ghi 3499 %}, {% ghi 3543 %} {% ghi 3549 %} Made some optimizations around the processing of file +references in the GC code. + +* {% ghi 3500 %}, {% ghi 3509 %} TabletFile constructor was calling Path.getParent() which was spending +a lot of time performing Path validation. Modified the constructor to reduce the calls to Path.getParent. + +* {% ghi 3541 %}, {% ghi 3542 %} The TabletGroupWatcher threads in the Manager are responsible for tablet +state and for making sure that tablets are balanced and assigned. The TabletGroupWatcher's iterate over +all of the tablets, then wait for 60s before beginning the next iteration. Backported a new property, +MANAGER_TABLET_GROUP_WATCHER_INTERVAL, to make this wait time configurable. + +Improvements that help with administration: + +* {% ghi 3678 %}, {% ghi 3683 %} Added validation of property table.class.loader.context when it is set. +If the context name is null, an empty string, results in an exception creating the classloader for the +context, or if the resulting classloader is null, then an exception will be returned and the property +will not be set. + +* {% ghi 3548 %}, {% ghi 3561 %} Displayed Manager state prominently on the Monitor UI. + +* {% ghi 3383 %}, {% ghi 3680 %} Prompt the user for confirmation when they attempt to set a deprecated +property in the Shell as a way to get them to use the non-deprecated property. + +* {% ghi 3488 %}, {% ghi 3612 %} Made tserver scans and compaction columns numerically sortable on the +Monitor UI. + +* {% ghi 3233 %}, {% ghi 3562 %} Added copy-properties option to createnamespace and createtable shell +commands + +### Notable Bug Fixes + +* {% ghi 3674 %}, {% ghi 3677 %}, {% ghi 3685 %} An invalid context classloader property was preventing +a minor compaction output file from being created, because the volume chooser class could not be loaded, +which failed the minor compaction thread. Once the minor compaction thread is dead, it will prevent future minor compactions from starting, subsequently preventing the tablet from being closed normally. The fixes here +include catching a broader range of exceptions in the minor compaction thread in an attempt to save it +from dying and initiating a minor compaction before closing the compactable object in the tablet. + +* {% ghi 3630 %}, {% ghi 3631 %} ClientContext incorrectly converting BatchWriter latency and timeout values + +* {% ghi 3617 %}, {% ghi 3622 %} Close LocalityGroupReader when IOException is thrown to release reference +to a possibly corrupted stream in a cached block file. + +* {% ghi 3570 %}, {% ghi 3571 %} Fix TabletGroupWatcher shutdown order + +* {% ghi 3569 %}, {% ghi 3579 %} {% ghi 3644 %} Changes to ensure that scan sessions are cleaned up + +* {% ghi 3553 %}, {% ghi 3555 %} A failed user compaction would not retry and would hang + +* {% ghi 3600 %} Normalized metric labels and structure + +## Upgrading + +View the [Upgrading Accumulo documentation][upgrade] for guidance. + +## 2.1.2 GitHub Project + +[All tickets related to 2.1.2.][project] + + +[LTM]: {{ site.baseurl }}/contributor/versioning#LTM +[upgrade]: /docs/2.x/administration/upgrading +[project]: https://github.com/apache/accumulo/projects/29
[accumulo] 01/01: Merge branch '2.1'
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 57903f4636197202489f057fdbd0e2bb8f99a2f1 Merge: c99f708127 38c261d123 Author: Christopher Tubbs AuthorDate: Mon Aug 14 15:58:35 2023 -0400 Merge branch '2.1' .../main/java/org/apache/accumulo/shell/Shell.java | 21 ++ .../accumulo/shell/commands/ConfigCommand.java | 32 -- .../shell/commands/DeleteNamespaceCommand.java | 14 ++ .../accumulo/shell/commands/DropUserCommand.java | 9 +- .../accumulo/shell/commands/MergeCommand.java | 11 +++- .../accumulo/shell/commands/TableOperation.java| 24 +++- .../shell/commands/DropUserCommandTest.java| 11 ++-- .../org/apache/accumulo/test/shell/ShellIT.java| 10 --- 8 files changed, 58 insertions(+), 74 deletions(-) diff --cc test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java index 130451c853,b211d3880b..93ac1459f5 --- a/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java +++ b/test/src/main/java/org/apache/accumulo/test/shell/ShellIT.java @@@ -416,10 -424,35 +418,10 @@@ public class ShellIT extends SharedMini String expectedFew = "1 123:12345 [12345678] 123456789\t12345"; exec("scan -st", true, expected); exec("scan -st -f 5", true, expectedFew); -// also prove that BinaryFormatter behaves same as the default -exec("scan -st -fm org.apache.accumulo.core.util.format.BinaryFormatter", true, expected); -exec("scan -st -f 5 -fm org.apache.accumulo.core.util.format.BinaryFormatter", true, -expectedFew); exec("setauths -c", true); - exec("deletetable test -f", true, "Table: [test] has been deleted"); + exec("deletetable " + name + " -f", true, "Table: [" + name + "] has been deleted"); } - @Test - public void scanDateStringFormatterTest() throws IOException { -Shell.log.debug("Starting scan dateStringFormatter test --"); -exec("createtable t", true); -exec("insert r f q v -ts 0", true); -@SuppressWarnings("deprecation") -DateFormat dateFormat = -new SimpleDateFormat(org.apache.accumulo.core.util.format.DateStringFormatter.DATE_FORMAT); -String expected = String.format("r f:q [] %s\tv", dateFormat.format(new Date(0))); -// historically, showing few did not pertain to ColVis or Timestamp -String expectedNoTimestamp = "r f:q []\tv"; -exec("scan -fm org.apache.accumulo.core.util.format.DateStringFormatter -st", true, expected); -exec("scan -fm org.apache.accumulo.core.util.format.DateStringFormatter -st -f 1000", true, -expected); -exec("scan -fm org.apache.accumulo.core.util.format.DateStringFormatter -st -f 5", true, -expected); -exec("scan -fm org.apache.accumulo.core.util.format.DateStringFormatter", true, -expectedNoTimestamp); -exec("deletetable t -f", true, "Table: [t] has been deleted"); - } - @Test public void grepTest() throws IOException { Shell.log.debug("Starting grep test --");
[accumulo] branch main updated (c99f708127 -> 57903f4636)
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 c99f708127 Merge branch '2.1' add 38c261d123 consolidate y/n prompts in shell (#3684) new 57903f4636 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: .../main/java/org/apache/accumulo/shell/Shell.java | 21 ++ .../accumulo/shell/commands/ConfigCommand.java | 32 -- .../shell/commands/DeleteNamespaceCommand.java | 14 ++ .../accumulo/shell/commands/DropUserCommand.java | 9 +- .../accumulo/shell/commands/MergeCommand.java | 11 +++- .../accumulo/shell/commands/TableOperation.java| 24 +++- .../shell/commands/DropUserCommandTest.java| 11 ++-- .../org/apache/accumulo/test/shell/ShellIT.java| 10 --- 8 files changed, 58 insertions(+), 74 deletions(-)
[accumulo] branch 2.1 updated: consolidate y/n prompts in shell (#3684)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/2.1 by this push: new 38c261d123 consolidate y/n prompts in shell (#3684) 38c261d123 is described below commit 38c261d1236f118ffc2c6eebc505f5daf12bf0e2 Author: EdColeman AuthorDate: Mon Aug 14 19:57:00 2023 + consolidate y/n prompts in shell (#3684) * Add `confirm` method to Shell to handle yes/no prompts consistently * Use `Optional` type so an empty Optional represents aborting the question - Co-authored-by: Ed Coleman Co-authored-by: Daniel Roberts Co-authored-by: Christopher Tubbs --- .../main/java/org/apache/accumulo/shell/Shell.java | 21 ++ .../accumulo/shell/commands/ConfigCommand.java | 32 -- .../shell/commands/DeleteNamespaceCommand.java | 14 ++ .../accumulo/shell/commands/DropUserCommand.java | 9 +- .../accumulo/shell/commands/MergeCommand.java | 11 +++- .../accumulo/shell/commands/TableOperation.java| 24 +++- .../shell/commands/DropUserCommandTest.java| 11 ++-- .../org/apache/accumulo/test/shell/ShellIT.java| 10 --- 8 files changed, 58 insertions(+), 74 deletions(-) diff --git a/shell/src/main/java/org/apache/accumulo/shell/Shell.java b/shell/src/main/java/org/apache/accumulo/shell/Shell.java index 05dedd2d1b..3923346d40 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/Shell.java +++ b/shell/src/main/java/org/apache/accumulo/shell/Shell.java @@ -39,6 +39,7 @@ import java.util.Locale; import java.util.Map; import java.util.Map.Entry; import java.util.Objects; +import java.util.Optional; import java.util.Properties; import java.util.Set; import java.util.TreeMap; @@ -1263,4 +1264,24 @@ public class Shell extends ShellOptions implements KeywordExecutable { return exit; } + /** + * Prompt user for yes/no using the shell prompt. + * + * @param prompt the string printed to user, with (yes|no)? appended as the prompt. + * @return true if user enters y | yes, false or null. + */ + public Optional confirm(final String prompt) { +getWriter().flush(); +String line; +Optional confirmed = Optional.empty(); +try { + line = getReader().readLine(prompt + " (yes|no)? "); +} catch (EndOfFileException ignored) { + line = null; +} +if (line != null) { + confirmed = Optional.of(line.equalsIgnoreCase("y") || line.equalsIgnoreCase("yes")); +} +return confirmed; + } } diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java index b7e062ad72..9b1b8e43cf 100644 --- a/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java +++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ConfigCommand.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Objects; import java.util.Set; import java.util.TreeMap; @@ -78,6 +79,8 @@ public class ConfigCommand extends Command { NamespaceNotFoundException { reader = shellState.getReader(); +boolean force = cl.hasOption(forceOpt); + final String tableName = cl.getOptionValue(tableOpt.getOpt()); if (tableName != null && !shellState.getAccumuloClient().tableOperations().exists(tableName)) { throw new TableNotFoundException(null, tableName, null); @@ -117,7 +120,8 @@ public class ConfigCommand extends Command { } } else if (cl.hasOption(setOpt.getOpt())) { // set property on table - String property = cl.getOptionValue(setOpt.getOpt()), value = null; + String property = cl.getOptionValue(setOpt.getOpt()); + String value; if (!property.contains("=")) { throw new BadArgumentException("Missing '=' operator in set operation.", fullCommand, fullCommand.indexOf(property)); @@ -129,8 +133,9 @@ public class ConfigCommand extends Command { // check for deprecation var theProp = Property.getPropertyByKey(property); if (theProp != null && theProp.isDeprecated()) { -if (!forceSet(shellState, cl, -"Trying to set deprecated property `" + property + "` continue")) { +if (!force +&& !shellState.confirm("Trying to set deprecated property `" + property + "` continue") +.orElse(false)) { throw new BadArgumentException( "Tried to set deprecated property and force not specified.", fullCommand, fullCommand.indexOf(property)); @@ -209,8 +214,8 @@ public class ConfigCommand extends Command { String n = Namespaces.getNamespaceName(shellState.getContext(),
[accumulo] branch main updated (67ca64eeb5 -> c99f708127)
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 67ca64eeb5 Merge branch '2.1' add 12c0b7b018 Fix bad assert statements in tests (#3691) new c99f708127 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: .../apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java| 2 +- test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
[accumulo] 01/01: Merge branch '2.1'
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 c99f7081272647f73339fffad01871aeba483210 Merge: 67ca64eeb5 12c0b7b018 Author: Christopher Tubbs AuthorDate: Mon Aug 14 13:40:26 2023 -0400 Merge branch '2.1' .../apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java| 2 +- test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-)
[accumulo] branch 2.1 updated: Fix bad assert statements in tests (#3691)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git The following commit(s) were added to refs/heads/2.1 by this push: new 12c0b7b018 Fix bad assert statements in tests (#3691) 12c0b7b018 is described below commit 12c0b7b018b17b59c31a1279c1ef3281a0011d17 Author: Christopher Tubbs AuthorDate: Mon Aug 14 13:39:29 2023 -0400 Fix bad assert statements in tests (#3691) Fix the incorrect use of assert statements in test code when a JUnit assertTrue is the appropriate solution to resolve the error caught by the errorprone compiler. --- .../apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java| 2 +- test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java | 3 ++- .../java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java index 0d3cdd6f04..559c649ffa 100644 --- a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java +++ b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/AccumuloInputFormatIT.java @@ -205,7 +205,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness { // Check we are getting back correct type pf split splits = inputFormat.getSplits(job); for (InputSplit split : splits) { - assert (split instanceof BatchInputSplit); + assertTrue(split instanceof BatchInputSplit); } // We should split along the tablet lines diff --git a/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java b/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java index 903c93b5f7..531a9ef0d2 100644 --- a/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/TabletIT.java @@ -20,6 +20,7 @@ package org.apache.accumulo.test.functional; import static java.util.Collections.singletonMap; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.time.Duration; import java.util.Map; @@ -96,7 +97,7 @@ public class TabletIT extends AccumuloClusterHarness { int count = 0; for (Entry elt : scanner) { String expected = String.format("%05d", count); -assert elt.getKey().getRow().toString().equals(expected); +assertTrue(elt.getKey().getRow().toString().equals(expected)); count++; } assertEquals(N, count); diff --git a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java index a1349257cd..d4af176e6a 100644 --- a/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java +++ b/test/src/main/java/org/apache/accumulo/test/mapreduce/AccumuloInputFormatIT.java @@ -23,6 +23,7 @@ import static org.apache.accumulo.core.util.UtilWaitThread.sleepUninterruptibly; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.IOException; @@ -190,7 +191,7 @@ public class AccumuloInputFormatIT extends AccumuloClusterHarness { client.tableOperations().online(table); splits = inputFormat.getSplits(job); for (InputSplit split : splits) { -assert (split instanceof org.apache.accumulo.core.clientImpl.mapreduce.BatchInputSplit); +assertTrue(split instanceof org.apache.accumulo.core.clientImpl.mapreduce.BatchInputSplit); } // We should divide along the tablet lines similar to when using `setAutoAdjustRanges(job,
[accumulo] branch 3.0.0-rc0-next deleted (was 7e54ccc3d8)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 3.0.0-rc0-next in repository https://gitbox.apache.org/repos/asf/accumulo.git was 7e54ccc3d8 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard 7e54ccc3d8 [maven-release-plugin] prepare for next development iteration discard 733ea1a539 [maven-release-plugin] prepare release rel/3.0.0
[accumulo] branch 3.0.0-rc0 deleted (was 733ea1a539)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 3.0.0-rc0 in repository https://gitbox.apache.org/repos/asf/accumulo.git was 733ea1a539 [maven-release-plugin] prepare release rel/3.0.0 This change permanently discards the following revisions: discard 733ea1a539 [maven-release-plugin] prepare release rel/3.0.0
[accumulo] 01/01: [maven-release-plugin] prepare release rel/3.0.0
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 3.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit fcf3192f27935ee3c66426fb89799ee0850944f2 Author: Christopher Tubbs AuthorDate: Mon Aug 14 04:11:10 2023 -0400 [maven-release-plugin] prepare release rel/3.0.0 --- assemble/pom.xml | 2 +- core/pom.xml | 2 +- hadoop-mapreduce/pom.xml | 2 +- iterator-test-harness/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 6 +++--- server/base/pom.xml | 2 +- server/compaction-coordinator/pom.xml | 2 +- server/compactor/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/manager/pom.xml| 2 +- server/monitor/pom.xml| 2 +- server/native/pom.xml | 2 +- server/tserver/pom.xml| 2 +- shell/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/assemble/pom.xml b/assemble/pom.xml index b09e8c7bff..0dfec51b18 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0-SNAPSHOT +3.0.0 accumulo pom diff --git a/core/pom.xml b/core/pom.xml index d8802e3eb4..62bffca363 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0-SNAPSHOT +3.0.0 accumulo-core Apache Accumulo Core diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml index dbafe8ca94..b837b5c1d7 100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0-SNAPSHOT +3.0.0 accumulo-hadoop-mapreduce Apache Accumulo Hadoop MapReduce diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml index d9df0eb3f1..a7db3df719 100644 --- a/iterator-test-harness/pom.xml +++ b/iterator-test-harness/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0-SNAPSHOT +3.0.0 accumulo-iterator-test-harness Apache Accumulo Iterator Test Harness diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 232cdf7d00..60d7517b55 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0-SNAPSHOT +3.0.0 accumulo-minicluster Apache Accumulo MiniCluster diff --git a/pom.xml b/pom.xml index a2eecf76d7..e59502918f 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.accumulo accumulo-project - 3.0.0-SNAPSHOT + 3.0.0 pom Apache Accumulo Project Apache Accumulo is a sorted, distributed key/value store based @@ -99,7 +99,7 @@ scm:git:https://gitbox.apache.org/repos/asf/accumulo.git scm:git:https://gitbox.apache.org/repos/asf/accumulo.git -HEAD +rel/3.0.0 https://gitbox.apache.org/repos/asf?p=accumulo.git @@ -136,7 +136,7 @@ 11 3.6.0 - 2023-06-14T05:41:08Z + 2023-08-14T08:10:15Z true source-release-tar diff --git a/server/base/pom.xml b/server/base/pom.xml index 5888ffa259..496c178fde 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0-SNAPSHOT +3.0.0 ../../pom.xml accumulo-server-base diff --git a/server/compaction-coordinator/pom.xml b/server/compaction-coordinator/pom.xml index f8cfc7b4cc..80021a9b04 100644 --- a/server/compaction-coordinator/pom.xml +++ b/server/compaction-coordinator/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0-SNAPSHOT +3.0.0 ../../pom.xml accumulo-compaction-coordinator diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml index 0e8e02deea..45cac52422 100644 --- a/server/compactor/pom.xml +++ b/server/compactor/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0-SNAPSHOT +3.0.0 ../../pom.xml accumulo-compactor diff --git a/server/gc/pom.xml b/server/gc/pom.xml index 664ff6a1df..0696793f49 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0-SNAPSHOT +3.0.0 ../../pom.xml accumulo-gc diff --git a/server/manager/pom.xml b/server/manager/pom.xml index c948efd151..c28b1c1f6c 100644 --- a/server/manager/pom.xml +++ b/server/manager/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0-SNAPSHOT +3.0.0 ../../pom.xml accumulo-manager diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml index
[accumulo] 01/01: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 3.0.0-rc1-next in repository https://gitbox.apache.org/repos/asf/accumulo.git commit a169a9011c65ba0ce6f89935668af76bc1409066 Author: Christopher Tubbs AuthorDate: Mon Aug 14 04:11:10 2023 -0400 [maven-release-plugin] prepare for next development iteration --- assemble/pom.xml | 2 +- core/pom.xml | 2 +- hadoop-mapreduce/pom.xml | 2 +- iterator-test-harness/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 6 +++--- server/base/pom.xml | 2 +- server/compaction-coordinator/pom.xml | 2 +- server/compactor/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/manager/pom.xml| 2 +- server/monitor/pom.xml| 2 +- server/native/pom.xml | 2 +- server/tserver/pom.xml| 2 +- shell/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml | 2 +- 17 files changed, 19 insertions(+), 19 deletions(-) diff --git a/assemble/pom.xml b/assemble/pom.xml index 0dfec51b18..5ef8308297 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0 +3.1.0-SNAPSHOT accumulo pom diff --git a/core/pom.xml b/core/pom.xml index 62bffca363..8d7f358821 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0 +3.1.0-SNAPSHOT accumulo-core Apache Accumulo Core diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml index b837b5c1d7..2d67c15594 100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0 +3.1.0-SNAPSHOT accumulo-hadoop-mapreduce Apache Accumulo Hadoop MapReduce diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml index a7db3df719..e142e2896d 100644 --- a/iterator-test-harness/pom.xml +++ b/iterator-test-harness/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0 +3.1.0-SNAPSHOT accumulo-iterator-test-harness Apache Accumulo Iterator Test Harness diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 60d7517b55..ba9c8aa663 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0 +3.1.0-SNAPSHOT accumulo-minicluster Apache Accumulo MiniCluster diff --git a/pom.xml b/pom.xml index e59502918f..cb3206d236 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.accumulo accumulo-project - 3.0.0 + 3.1.0-SNAPSHOT pom Apache Accumulo Project Apache Accumulo is a sorted, distributed key/value store based @@ -99,7 +99,7 @@ scm:git:https://gitbox.apache.org/repos/asf/accumulo.git scm:git:https://gitbox.apache.org/repos/asf/accumulo.git -rel/3.0.0 +HEAD https://gitbox.apache.org/repos/asf?p=accumulo.git @@ -136,7 +136,7 @@ 11 3.6.0 - 2023-08-14T08:10:15Z + 2023-08-14T08:11:10Z true source-release-tar diff --git a/server/base/pom.xml b/server/base/pom.xml index 496c178fde..6b767740c5 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0 +3.1.0-SNAPSHOT ../../pom.xml accumulo-server-base diff --git a/server/compaction-coordinator/pom.xml b/server/compaction-coordinator/pom.xml index 80021a9b04..5b3ad76e40 100644 --- a/server/compaction-coordinator/pom.xml +++ b/server/compaction-coordinator/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0 +3.1.0-SNAPSHOT ../../pom.xml accumulo-compaction-coordinator diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml index 45cac52422..efa5026c5e 100644 --- a/server/compactor/pom.xml +++ b/server/compactor/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0 +3.1.0-SNAPSHOT ../../pom.xml accumulo-compactor diff --git a/server/gc/pom.xml b/server/gc/pom.xml index 0696793f49..d39e2b5321 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0 +3.1.0-SNAPSHOT ../../pom.xml accumulo-gc diff --git a/server/manager/pom.xml b/server/manager/pom.xml index c28b1c1f6c..5b84e1d579 100644 --- a/server/manager/pom.xml +++ b/server/manager/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -3.0.0 +3.1.0-SNAPSHOT ../../pom.xml accumulo-manager diff --git a/server/monitor/pom.xml b/server/monitor/pom.xml index
[accumulo] branch 3.0.0-rc1 created (now fcf3192f27)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 3.0.0-rc1 in repository https://gitbox.apache.org/repos/asf/accumulo.git at fcf3192f27 [maven-release-plugin] prepare release rel/3.0.0 This branch includes the following new commits: new fcf3192f27 [maven-release-plugin] prepare release rel/3.0.0 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.
[accumulo] branch 3.0.0-rc1-next created (now a169a9011c)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 3.0.0-rc1-next in repository https://gitbox.apache.org/repos/asf/accumulo.git at a169a9011c [maven-release-plugin] prepare for next development iteration This branch includes the following new commits: new fcf3192f27 [maven-release-plugin] prepare release rel/3.0.0 new a169a9011c [maven-release-plugin] prepare for next development iteration The 2 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.
[accumulo] 01/01: [maven-release-plugin] prepare for next development iteration
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1.2-rc1-next in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 4c7e6a3d9636b16b1dcf942263f61897b50e837f Author: Christopher Tubbs AuthorDate: Mon Aug 14 04:01:47 2023 -0400 [maven-release-plugin] prepare for next development iteration --- assemble/pom.xml | 2 +- core/pom.xml | 2 +- hadoop-mapreduce/pom.xml | 2 +- iterator-test-harness/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 6 +++--- server/base/pom.xml | 2 +- server/compaction-coordinator/pom.xml | 2 +- server/compactor/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/manager/pom.xml| 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml| 2 +- server/native/pom.xml | 2 +- server/tserver/pom.xml| 2 +- shell/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/assemble/pom.xml b/assemble/pom.xml index 63b3d18bec..60f04dcaad 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2 +2.1.3-SNAPSHOT accumulo pom diff --git a/core/pom.xml b/core/pom.xml index 22878b84f5..b050a03566 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2 +2.1.3-SNAPSHOT accumulo-core Apache Accumulo Core diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml index c95ec30bb1..a56abf9073 100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2 +2.1.3-SNAPSHOT accumulo-hadoop-mapreduce Apache Accumulo Hadoop MapReduce diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml index 8f3fc8401f..11fbcb26a4 100644 --- a/iterator-test-harness/pom.xml +++ b/iterator-test-harness/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2 +2.1.3-SNAPSHOT accumulo-iterator-test-harness Apache Accumulo Iterator Test Harness diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 645d966d76..6a17606475 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2 +2.1.3-SNAPSHOT accumulo-minicluster Apache Accumulo MiniCluster diff --git a/pom.xml b/pom.xml index b6873e45b7..5414e1ce64 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.accumulo accumulo-project - 2.1.2 + 2.1.3-SNAPSHOT pom Apache Accumulo Project Apache Accumulo is a sorted, distributed key/value store based @@ -100,7 +100,7 @@ scm:git:https://gitbox.apache.org/repos/asf/accumulo.git scm:git:https://gitbox.apache.org/repos/asf/accumulo.git -rel/2.1.2 +HEAD https://gitbox.apache.org/repos/asf?p=accumulo.git @@ -137,7 +137,7 @@ 11 3.6.0 - 2023-08-14T08:00:50Z + 2023-08-14T08:01:47Z true source-release-tar diff --git a/server/base/pom.xml b/server/base/pom.xml index 77540c64d6..13984282d5 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2 +2.1.3-SNAPSHOT ../../pom.xml accumulo-server-base diff --git a/server/compaction-coordinator/pom.xml b/server/compaction-coordinator/pom.xml index 6bd7e60768..151cc8fdd2 100644 --- a/server/compaction-coordinator/pom.xml +++ b/server/compaction-coordinator/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2 +2.1.3-SNAPSHOT ../../pom.xml accumulo-compaction-coordinator diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml index aa1ba10269..e7e4263066 100644 --- a/server/compactor/pom.xml +++ b/server/compactor/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2 +2.1.3-SNAPSHOT ../../pom.xml accumulo-compactor diff --git a/server/gc/pom.xml b/server/gc/pom.xml index 32ff0d1160..1c2d9b9cba 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2 +2.1.3-SNAPSHOT ../../pom.xml accumulo-gc diff --git a/server/manager/pom.xml b/server/manager/pom.xml index 23d836cd9f..920509a740 100644 --- a/server/manager/pom.xml +++ b/server/manager/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2 +2.1.3-SNAPSHOT ../../pom.xml accumulo-manager diff --git
[accumulo] branch 2.1.2-rc1 created (now ee7ae63a82)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.1.2-rc1 in repository https://gitbox.apache.org/repos/asf/accumulo.git at ee7ae63a82 [maven-release-plugin] prepare release rel/2.1.2 This branch includes the following new commits: new ee7ae63a82 [maven-release-plugin] prepare release rel/2.1.2 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.
[accumulo] branch 2.1.2-rc1-next created (now 4c7e6a3d96)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.1.2-rc1-next in repository https://gitbox.apache.org/repos/asf/accumulo.git at 4c7e6a3d96 [maven-release-plugin] prepare for next development iteration This branch includes the following new commits: new ee7ae63a82 [maven-release-plugin] prepare release rel/2.1.2 new 4c7e6a3d96 [maven-release-plugin] prepare for next development iteration The 2 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.
[accumulo] 01/01: [maven-release-plugin] prepare release rel/2.1.2
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1.2-rc1 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit ee7ae63a823477b557aa9415a92653e95aa64cb1 Author: Christopher Tubbs AuthorDate: Mon Aug 14 04:01:47 2023 -0400 [maven-release-plugin] prepare release rel/2.1.2 --- assemble/pom.xml | 2 +- core/pom.xml | 2 +- hadoop-mapreduce/pom.xml | 2 +- iterator-test-harness/pom.xml | 2 +- minicluster/pom.xml | 2 +- pom.xml | 6 +++--- server/base/pom.xml | 2 +- server/compaction-coordinator/pom.xml | 2 +- server/compactor/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/manager/pom.xml| 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml| 2 +- server/native/pom.xml | 2 +- server/tserver/pom.xml| 2 +- shell/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/assemble/pom.xml b/assemble/pom.xml index fc2c9565c3..63b3d18bec 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2-SNAPSHOT +2.1.2 accumulo pom diff --git a/core/pom.xml b/core/pom.xml index 6981201b1b..22878b84f5 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2-SNAPSHOT +2.1.2 accumulo-core Apache Accumulo Core diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml index f63fa1eb4e..c95ec30bb1 100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2-SNAPSHOT +2.1.2 accumulo-hadoop-mapreduce Apache Accumulo Hadoop MapReduce diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml index fd7298764b..8f3fc8401f 100644 --- a/iterator-test-harness/pom.xml +++ b/iterator-test-harness/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2-SNAPSHOT +2.1.2 accumulo-iterator-test-harness Apache Accumulo Iterator Test Harness diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 913c76bebf..645d966d76 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2-SNAPSHOT +2.1.2 accumulo-minicluster Apache Accumulo MiniCluster diff --git a/pom.xml b/pom.xml index cb923db522..b6873e45b7 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.accumulo accumulo-project - 2.1.2-SNAPSHOT + 2.1.2 pom Apache Accumulo Project Apache Accumulo is a sorted, distributed key/value store based @@ -100,7 +100,7 @@ scm:git:https://gitbox.apache.org/repos/asf/accumulo.git scm:git:https://gitbox.apache.org/repos/asf/accumulo.git -HEAD +rel/2.1.2 https://gitbox.apache.org/repos/asf?p=accumulo.git @@ -137,7 +137,7 @@ 11 3.6.0 - 2023-06-14T05:41:08Z + 2023-08-14T08:00:50Z true source-release-tar diff --git a/server/base/pom.xml b/server/base/pom.xml index f399575a63..77540c64d6 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2-SNAPSHOT +2.1.2 ../../pom.xml accumulo-server-base diff --git a/server/compaction-coordinator/pom.xml b/server/compaction-coordinator/pom.xml index a4a4214700..6bd7e60768 100644 --- a/server/compaction-coordinator/pom.xml +++ b/server/compaction-coordinator/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2-SNAPSHOT +2.1.2 ../../pom.xml accumulo-compaction-coordinator diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml index 7cce8e71b0..aa1ba10269 100644 --- a/server/compactor/pom.xml +++ b/server/compactor/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2-SNAPSHOT +2.1.2 ../../pom.xml accumulo-compactor diff --git a/server/gc/pom.xml b/server/gc/pom.xml index 97687739b4..32ff0d1160 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2-SNAPSHOT +2.1.2 ../../pom.xml accumulo-gc diff --git a/server/manager/pom.xml b/server/manager/pom.xml index a0339c8bb3..23d836cd9f 100644 --- a/server/manager/pom.xml +++ b/server/manager/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.2-SNAPSHOT +2.1.2 ../../pom.xml accumulo-manager diff --git a/server/master/pom.xml
[accumulo] 06/08: Bump guava from 31.1-jre to 32.0.0-jre (#3497)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit c6024b2b62e54f743711b0a8a7d2a5d56362c11b Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jun 15 12:51:42 2023 -0400 Bump guava from 31.1-jre to 32.0.0-jre (#3497) Bumps [guava](https://github.com/google/guava) from 31.1-jre to 32.0.0-jre. - [Release notes](https://github.com/google/guava/releases) - [Commits](https://github.com/google/guava/commits) --- updated-dependencies: - dependency-name: com.google.guava:guava dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 87a3d84b05..194dba82ed 100644 --- a/pom.xml +++ b/pom.xml @@ -298,7 +298,7 @@ com.google.guava guava -31.1-jre +32.0.0-jre com.google.protobuf
[accumulo] 07/08: Update parent POM to 30 and remove contrib dir (#3550)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 9e8b59caa131ec3d5f6443665801aa0d3030e093 Author: Christopher Tubbs AuthorDate: Wed Jun 28 15:21:50 2023 -0400 Update parent POM to 30 and remove contrib dir (#3550) Remove `contrib/` directory: * Force use of JDK 17 for building aggregate javadocs for website, to avoid needing to patch buggy JDK 11 javadocs before publishing * Relocate contrib/ci scripts to more Maven-like location, src/build/ci * Remove redundant copy of contrib/accumulo-logo.png; use identical copy from monitor module for the README.md * Remove unmaintained contrib/scripts/check-tservers.py (has not received any substantive updates since initial publication, and does not work with current versions of Python, and is not documented (if updated, this can be restored to a blog on the website, or added elsewhere as a maintenance tool, but there are probably better ways of checking a cluster's health using non-python command-line utilities) * Relocate license template and formatter config file to src/build, and fix license-header.txt references using build-helper's rootlocation rather than session.executionRootDirectory Bump ASF parent POM to version 30 and related POM improvements: * Remove useless comment about ``, regarding plugin not built in this repo * Ensure `maven.site.skip` is true, since we don't use that to build our website, and don't want that plugin running at all, and remove the outdated and unused src/site/site.xml site descriptor * Stop overriding plugin versions that are the same as in the parent POM (or in the case of maven-site-plugin, doesn't matter because we don't use that plugin) * Remove extraneous maven-clean-plugin configuration that isn't needed since those files don't appear in our source tree and are cleaned up already from the target directory * Bump minimum Maven version to build, because apilyzer requires 3.6 * Adopt version property naming convention ASF parent POM Other fixes: * Bump some build plugins * Bump errorprone and fix newly detected illogical check if int is greater than `Integer.MAX_VALUE` * Bump some dependency versions --- .github/ISSUE_TEMPLATE/post_vote_checklist.md | 3 +- .github/workflows/maven-full-its.yaml | 2 +- .github/workflows/maven.yaml | 6 +- .github/workflows/scripts.yaml | 12 +- README.md | 2 +- contrib/accumulo-logo.png | Bin 11427 -> 0 bytes contrib/javadoc11.patch| 91 -- contrib/scripts/check-tservers.py | 202 - core/pom.xml | 2 +- pom.xml| 175 +++--- .../accumulo/server/fs/VolumeManagerImpl.java | 17 +- server/monitor/pom.xml | 2 +- server/tserver/pom.xml | 2 +- {contrib => src/build}/ci/find-unapproved-chars.sh | 0 {contrib => src/build}/ci/find-unapproved-junit.sh | 0 {contrib => src/build}/ci/install-shfmt.sh | 0 {contrib => src/build}/ci/install-thrift.sh| 2 +- {contrib => src/build}/ci/it-matrix.sh | 0 {contrib => src/build}/ci/run-shellcheck.sh| 0 {contrib => src/build}/ci/run-shfmt.sh | 0 {contrib => src/build}/ci/run-thrift.sh| 0 .../build/eclipse-codestyle.xml| 0 {contrib => src/build}/license-header.txt | 0 src/site/site.xml | 44 - 24 files changed, 92 insertions(+), 470 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/post_vote_checklist.md b/.github/ISSUE_TEMPLATE/post_vote_checklist.md index 9b504afb04..59bfc3efe2 100644 --- a/.github/ISSUE_TEMPLATE/post_vote_checklist.md +++ b/.github/ISSUE_TEMPLATE/post_vote_checklist.md @@ -32,8 +32,7 @@ assignees: '' - [ ] Downloads page - [ ] If LTM release, update previous LTM release entry on downloads page and release notes with an EOL date 1 year from the current release date - [ ] DOAP file - - [ ] Add manual/examples/javadoc (build javadoc from tag with `mvn clean package -DskipTests javadoc:aggregate -Paggregate-javadocs`) - - [ ] If javadoc is built with Java 11, [patch it](https://github.com/apache/accumulo/blob/main/contrib/javadoc11.patch) + - [ ] Add manual/examples/javadoc (build javadoc from tag with `mvn clean package -DskipTests javadoc:aggregate -Paggregate-javadocs` using at least JDK 17) - [ ] Jekyll config - [ ] Grep for, and update any links to previous version to now
[accumulo] 05/08: Bump snappy-java from 1.1.9.1 to 1.1.10.1 (#3498)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit c1ed35411bcdcc56c451a5275a87b32cf60be5b3 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Thu Jun 15 12:35:07 2023 -0400 Bump snappy-java from 1.1.9.1 to 1.1.10.1 (#3498) Bumps [snappy-java](https://github.com/xerial/snappy-java) from 1.1.9.1 to 1.1.10.1. - [Release notes](https://github.com/xerial/snappy-java/releases) - [Commits](https://github.com/xerial/snappy-java/compare/v1.1.9.1...v1.1.10.1) --- updated-dependencies: - dependency-name: org.xerial.snappy:snappy-java dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 34214b4467..87a3d84b05 100644 --- a/pom.xml +++ b/pom.xml @@ -682,7 +682,7 @@ org.xerial.snappy snappy-java -1.1.9.1 +1.1.10.1 org.yaml
[accumulo] 04/08: Update datasketches-java to 4.0.0 (#3457)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 497d741f7acdbfb5e6431214063308e87c7d2df5 Author: Christopher Tubbs AuthorDate: Wed Jun 7 14:45:02 2023 -0400 Update datasketches-java to 4.0.0 (#3457) * Migrate to datasketches-java 4.0.0 * Add more comments to explain what's going on for the next dev --- .../apache/accumulo/core/file/rfile/GenerateSplits.java | 15 --- pom.xml | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/GenerateSplits.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/GenerateSplits.java index a21d5a37d2..1812358a59 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/rfile/GenerateSplits.java +++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/GenerateSplits.java @@ -51,6 +51,8 @@ import org.apache.accumulo.core.spi.crypto.CryptoService; import org.apache.accumulo.core.util.TextUtil; import org.apache.accumulo.start.spi.KeywordExecutable; import org.apache.datasketches.quantiles.ItemsSketch; +import org.apache.datasketches.quantilescommon.QuantileSearchCriteria; +import org.apache.datasketches.quantilescommon.QuantilesUtil; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -200,14 +202,21 @@ public class GenerateSplits implements KeywordExecutable { private Text[] getQuantiles(SortedKeyValueIterator iterator, int numSplits) throws IOException { -ItemsSketch itemsSketch = ItemsSketch.getInstance(BinaryComparable::compareTo); +var itemsSketch = ItemsSketch.getInstance(Text.class, BinaryComparable::compareTo); while (iterator.hasTop()) { Text row = iterator.getTopKey().getRow(); itemsSketch.update(row); iterator.next(); } -Text[] items = itemsSketch.getQuantiles(numSplits + 2); -// based on the ItemsSketch javadoc, method returns min, max as well so drop first and last +// the number requested represents the number of regions between the resulting array elements +// the actual number of array elements is one more than that to account for endpoints; +// so, we ask for one more because we want the number of median elements in the array to +// represent the number of split points and we will drop the first and last array element +double[] ranks = QuantilesUtil.equallyWeightedRanks(numSplits + 1); +// the choice to use INCLUSIVE or EXCLUSIVE is arbitrary here; EXCLUSIVE matches the behavior +// of datasketches 3.x, so we might as well preserve that for 4.x +Text[] items = itemsSketch.getQuantiles(ranks, QuantileSearchCriteria.EXCLUSIVE); +// drop the min and max, so we only keep the median elements to use as split points return Arrays.copyOfRange(items, 1, items.length - 1); } diff --git a/pom.xml b/pom.xml index 415f9ce60f..34214b4467 100644 --- a/pom.xml +++ b/pom.xml @@ -476,7 +476,7 @@ org.apache.datasketches datasketches-java -3.3.0 +4.0.0 org.apache.hadoop
[accumulo] 01/08: Add CI check to detect Thrift changes (#3362)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit b59dfa9564da59a3e7dff79dd0220aae45af25bf Author: Christopher Tubbs AuthorDate: Fri Apr 28 10:40:08 2023 -0400 Add CI check to detect Thrift changes (#3362) Add a GitHub Actions check that re-generates the Thrift generated code, and compares the alterations to what's committed to the repo. The check will fail if Thrift generates something that isn't checked in. This ensures that we can ignore generated code changes when reviewing pull requests, because if the generated code contained anything unexpected, this check would make it obvious. This fixes #3095 --- .github/workflows/scripts.yaml | 16 contrib/ci/install-thrift.sh | 31 +++ contrib/ci/run-thrift.sh | 35 +++ 3 files changed, 82 insertions(+) diff --git a/.github/workflows/scripts.yaml b/.github/workflows/scripts.yaml index 8409978d8e..2189d9c868 100644 --- a/.github/workflows/scripts.yaml +++ b/.github/workflows/scripts.yaml @@ -59,3 +59,19 @@ jobs: - name: Running shellcheck on all scripts run: contrib/ci/run-shellcheck.sh + thrift: +name: Thrift +timeout-minutes: 3 +runs-on: ubuntu-latest +steps: +- uses: actions/checkout@v3 +- name: Show the first log message + run: git log -n1 +- name: Update package repository + run: sudo apt-get update +- name: Install xmllint + run: sudo apt-get install libxml2-utils +- name: Install thrift + run: contrib/ci/install-thrift.sh +- name: Running thrift to check for changes + run: contrib/ci/run-thrift.sh diff --git a/contrib/ci/install-thrift.sh b/contrib/ci/install-thrift.sh new file mode 100755 index 00..a46e7c694f --- /dev/null +++ b/contrib/ci/install-thrift.sh @@ -0,0 +1,31 @@ +#! /usr/bin/env bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +# Download the correct version of Thrift to do CI checks + +set -e + +thriftdefault="0.16.0" +rootDir=$(git rev-parse --show-toplevel 2>/dev/null) || ver=$thriftdefault +ver=$({ xmllint --shell "$rootDir/pom.xml" <<<'xpath /*[local-name()="project"]/*[local-name()="properties"]/*[local-name()="thrift.version"]/text()' | grep content= | cut -f2 -d=; } 2>/dev/null || echo "$thriftdefault") +ver=${ver%%-*} + +sudo wget "https://dist.apache.org/repos/dist/dev/accumulo/devtools/thrift-$ver/thrift; -O /usr/local/bin/thrift && + sudo chmod +x /usr/local/bin/thrift diff --git a/contrib/ci/run-thrift.sh b/contrib/ci/run-thrift.sh new file mode 100755 index 00..95694191f8 --- /dev/null +++ b/contrib/ci/run-thrift.sh @@ -0,0 +1,35 @@ +#! /usr/bin/env bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +# Check that the generated thrift code hasn't changed from +# what is currently checked in to the repository + +set -e + +echo 'Checking if thrift modified any files...' +(cd core && src/main/scripts/generate-thrift.sh) + +if [[ -n $(git status --porcelain --ignored=no) ]]; then + echo 'Thrift build changed files in worktree:' + git status --short --ignored=no + exit 1 +else + echo 'No changes detected.' +fi
[accumulo] 03/08: More build updates to reduce warnings (#3426)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 4f5d358dcc169d08a507e9f3637d336143d34623 Author: Christopher Tubbs AuthorDate: Thu May 25 15:30:36 2023 -0400 More build updates to reduce warnings (#3426) Reduce warnings at the end of the build from using Maven 3.9.2 by updating several plugins whose versions are specified in the parent POM to the latest, which resolves the warnings from Maven. Specifically, update maven-resources-plugin, maven-compiler-plugin, exec-maven-plugin, apilyzer-maven-plugin, maven-dependency-plugin, and maven-enforcer-plugin. Update some dependency declarations, based on new detections from latest version of maven-dependency-plugin (specifically, zookeeper-jute in minicluster and libthrift in the monitor). Updating exec-maven-plugin required addressing #3033 with a workaround, and testing the script added for that workaround caught some additional shellcheck issues in the assembly module's cluster management scripts (unreachable redundant exit command) and generate-thrift.sh (unquoted path variable). So those fixes are included here as well. This fixes #3033. --- assemble/bin/accumulo-cluster| 1 - assemble/bin/accumulo-service| 1 - assemble/bin/accumulo-util | 1 - core/pom.xml | 3 +-- core/src/main/scripts/generate-thrift.sh | 2 +- core/src/main/scripts/mkdirs.sh | 27 +++ minicluster/pom.xml | 4 pom.xml | 22 ++ server/monitor/pom.xml | 4 9 files changed, 55 insertions(+), 10 deletions(-) diff --git a/assemble/bin/accumulo-cluster b/assemble/bin/accumulo-cluster index 3e511dfea2..c9936cb78b 100755 --- a/assemble/bin/accumulo-cluster +++ b/assemble/bin/accumulo-cluster @@ -34,7 +34,6 @@ Commands: start-here Starts all services on this node stop-here Stops all services on this node EOF - exit 1 } function invalid_args { diff --git a/assemble/bin/accumulo-service b/assemble/bin/accumulo-service index 2386e09df9..552c2b2251 100755 --- a/assemble/bin/accumulo-service +++ b/assemble/bin/accumulo-service @@ -38,7 +38,6 @@ Commands: killKills service EOF - exit 1 } function invalid_args { diff --git a/assemble/bin/accumulo-util b/assemble/bin/accumulo-util index bc7fcb32e3..12707e2d69 100755 --- a/assemble/bin/accumulo-util +++ b/assemble/bin/accumulo-util @@ -28,7 +28,6 @@ Commands: gen-monitor-certGenerates Accumulo monitor certificate EOF - exit 1 } function build_native() { diff --git a/core/pom.xml b/core/pom.xml index f00e6ec30c..984726fb88 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -334,9 +334,8 @@ prepare-package - mkdir + ${basedir}/src/main/scripts/mkdirs.sh --p ${project.build.directory}/generated-docs diff --git a/core/src/main/scripts/generate-thrift.sh b/core/src/main/scripts/generate-thrift.sh index a20bc7123a..37929eef91 100755 --- a/core/src/main/scripts/generate-thrift.sh +++ b/core/src/main/scripts/generate-thrift.sh @@ -78,7 +78,7 @@ done # add dummy method to suppress "unnecessary suppress warnings" for classes which don't have any unused variables # this only affects classes, enums aren't affected #shellcheck disable=SC1004 -find $BUILD_DIR/gen-java -name '*.java' -exec grep -Zl '^public class ' {} + | xargs -0 sed -i -e 's/^[}]$/ private static void unusedMethod() {}\ +find "$BUILD_DIR/gen-java" -name '*.java' -exec grep -Zl '^public class ' {} + | xargs -0 sed -i -e 's/^[}]$/ private static void unusedMethod() {}\ }/' for lang in "${LANGUAGES_TO_GENERATE[@]}"; do diff --git a/core/src/main/scripts/mkdirs.sh b/core/src/main/scripts/mkdirs.sh new file mode 100755 index 00..ce11309197 --- /dev/null +++ b/core/src/main/scripts/mkdirs.sh @@ -0,0 +1,27 @@ +#! /usr/bin/env bash +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language
[accumulo] 02/08: Minor POM quality updates (#3419)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit a07499e07adf1215b916d1e30b329acb7add1233 Author: Christopher Tubbs AuthorDate: Mon May 22 14:40:59 2023 -0400 Minor POM quality updates (#3419) * Update our plugins with versions that we specify to the latest * Update plugins whose versions are in the parent POM, to avoid warnings about deprecations in Maven 3.9 * Fail on javadoc doclint issues, and fix the single issue in the MetricsProducer * Work around revelc/impsort-maven-plugin#72 by renaming the "permits" variable in rate limiter APIs * Bump some low-risk dependencies: curator, jackson, micrometer, netty, opentelemetry, jetty, hk2, caffeine, gson, commons-io, commons-configuration2, checker-qual, hibernate-validator, jline, snappy-java, snakeyaml --- .../accumulo/core/metrics/MetricsProducer.java | 1 - .../core/util/ratelimit/GuavaRateLimiter.java | 10 ++-- .../core/util/ratelimit/NullRateLimiter.java | 2 +- .../accumulo/core/util/ratelimit/RateLimiter.java | 2 +- .../util/ratelimit/SharedRateLimiterFactory.java | 6 +-- pom.xml| 57 +- 6 files changed, 44 insertions(+), 34 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java index 82db7f71b2..c76a682f1b 100644 --- a/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java +++ b/core/src/main/java/org/apache/accumulo/core/metrics/MetricsProducer.java @@ -35,7 +35,6 @@ import io.micrometer.core.instrument.MeterRegistry; * https://micrometer.io/;>Micrometer. Micrometer suggests using a particular * https://micrometer.io/docs/concepts#_naming_meters;>naming convention for the * metrics. The table below contains a mapping of the old to new metric names. - * * * Summary of Metric Changes * diff --git a/core/src/main/java/org/apache/accumulo/core/util/ratelimit/GuavaRateLimiter.java b/core/src/main/java/org/apache/accumulo/core/util/ratelimit/GuavaRateLimiter.java index af7d11d051..c2db7b0e9a 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/ratelimit/GuavaRateLimiter.java +++ b/core/src/main/java/org/apache/accumulo/core/util/ratelimit/GuavaRateLimiter.java @@ -52,14 +52,14 @@ public class GuavaRateLimiter implements RateLimiter { } @Override - public void acquire(long permits) { + public void acquire(long numPermits) { if (this.currentRate > 0) { - while (permits > Integer.MAX_VALUE) { + while (numPermits > Integer.MAX_VALUE) { rateLimiter.acquire(Integer.MAX_VALUE); -permits -= Integer.MAX_VALUE; +numPermits -= Integer.MAX_VALUE; } - if (permits > 0) { -rateLimiter.acquire((int) permits); + if (numPermits > 0) { +rateLimiter.acquire((int) numPermits); } } } diff --git a/core/src/main/java/org/apache/accumulo/core/util/ratelimit/NullRateLimiter.java b/core/src/main/java/org/apache/accumulo/core/util/ratelimit/NullRateLimiter.java index 5842513270..8fae1479ed 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/ratelimit/NullRateLimiter.java +++ b/core/src/main/java/org/apache/accumulo/core/util/ratelimit/NullRateLimiter.java @@ -32,6 +32,6 @@ public class NullRateLimiter implements RateLimiter { } @Override - public void acquire(long permits) {} + public void acquire(long numPermits) {} } diff --git a/core/src/main/java/org/apache/accumulo/core/util/ratelimit/RateLimiter.java b/core/src/main/java/org/apache/accumulo/core/util/ratelimit/RateLimiter.java index ee6a45bbe5..b94ecb2638 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/ratelimit/RateLimiter.java +++ b/core/src/main/java/org/apache/accumulo/core/util/ratelimit/RateLimiter.java @@ -25,5 +25,5 @@ public interface RateLimiter { long getRate(); /** Sleep until the specified number of queries are available. */ - void acquire(long permits); + void acquire(long numPermits); } diff --git a/core/src/main/java/org/apache/accumulo/core/util/ratelimit/SharedRateLimiterFactory.java b/core/src/main/java/org/apache/accumulo/core/util/ratelimit/SharedRateLimiterFactory.java index bfb0becea0..71e26cde19 100644 --- a/core/src/main/java/org/apache/accumulo/core/util/ratelimit/SharedRateLimiterFactory.java +++ b/core/src/main/java/org/apache/accumulo/core/util/ratelimit/SharedRateLimiterFactory.java @@ -157,9 +157,9 @@ public class SharedRateLimiterFactory { } @Override -public void acquire(long permits) { - super.acquire(permits); - permitsAcquired.addAndGet(permits); +public void acquire(long numPermits) { + super.acquire(numPermits); +
[accumulo] 08/08: Bump ZooKeeper patch version
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit c38c10fec1e44b840650b8a7b31f60b428b96d3e Author: Christopher Tubbs AuthorDate: Mon Aug 14 02:54:17 2023 -0400 Bump ZooKeeper patch version * Bump ZK to 3.8.2 patch release * Backport test/build improvements from #3074 and #3080 * Include updates to post vote checklist GitHub issue template from main branch to reduce differences (has no effect on branches other than main) --- .github/ISSUE_TEMPLATE/post_vote_checklist.md | 5 ++--- core/pom.xml | 6 +- pom.xml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/post_vote_checklist.md b/.github/ISSUE_TEMPLATE/post_vote_checklist.md index 59bfc3efe2..24c8e9679d 100644 --- a/.github/ISSUE_TEMPLATE/post_vote_checklist.md +++ b/.github/ISSUE_TEMPLATE/post_vote_checklist.md @@ -24,8 +24,8 @@ assignees: '' - Verify published artifacts - [ ] In [Maven Central](https://repo1.maven.org/maven2/org/apache/accumulo/accumulo-core/) - [ ] In [ASF Downloads](https://downloads.apache.org/accumulo) - - [ ] In [several mirrors](https://www.apache.org/dyn/closer.lua/accumulo) -- Update the [staging website](https://accumulo.staged.apache.org/) + - [ ] In [several mirrors or CDN](https://www.apache.org/dyn/closer.lua/accumulo) +- Update the [website](https://accumulo.apache.org/) - [ ] Release notes - [ ] Add `LTM: true` to the release notes front-matter for LTM releases - [ ] Navigation @@ -36,7 +36,6 @@ assignees: '' - [ ] Jekyll config - [ ] Grep for, and update any links to previous version to now point to the new version - [ ] Update any older release notes front-matter to indicate they are either `archived: true` or `archived_critical: true` - - [ ] [Publish to production](https://github.com/apache/accumulo-website#publishing-staging-to-production) - Announcement email - [ ] Prepare and get review on dev list (see examples [from previous announcement messages](https://lists.apache.org/list.html?annou...@apache.org:gte=1d:accumulo)) - [ ] Send to annou...@apache.org and u...@accumulo.apache.org (use plain text mode only; html email will be rejected) diff --git a/core/pom.xml b/core/pom.xml index b8e93e48cd..6981201b1b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -424,6 +424,8 @@ **/TestCfCqSlice.java **/TestCfCqSliceSeekingFilter.java **/core/constraints/DefaultKeySizeConstraintTest.java + **/core/rpc/SaslConnectionParamsTest.java + **/core/clientImpl/ThriftTransportKeyTest.java @@ -443,7 +445,9 @@ **/IdleRatioScanPrioritizerTest.java **/TestCfCqSlice.java **/TestCfCqSliceSeekingFilter.java - **/core/constraints/DefaultKeySizeConstraintTest.java + **/core/constraints/DefaultKeySizeConstraintTest.java + **/core/rpc/SaslConnectionParamsTest.java + **/core/clientImpl/ThriftTransportKeyTest.java diff --git a/pom.xml b/pom.xml index 6cbabcb1df..cb923db522 100644 --- a/pom.xml +++ b/pom.xml @@ -156,7 +156,7 @@ 2.0.9 2.0.7 0.17.0 -3.8.1 +3.8.2
[accumulo] 01/01: Merge branch '2.1'
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 67ca64eeb528b10203c3bfd9ae36b281b041c82c Merge: 04262c07d7 c38c10fec1 Author: Christopher Tubbs AuthorDate: Mon Aug 14 03:42:08 2023 -0400 Merge branch '2.1' pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[accumulo] branch main updated (04262c07d7 -> 67ca64eeb5)
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 04262c07d7 Merge branch '2.1' new b59dfa9564 Add CI check to detect Thrift changes (#3362) new a07499e07a Minor POM quality updates (#3419) new 4f5d358dcc More build updates to reduce warnings (#3426) new 497d741f7a Update datasketches-java to 4.0.0 (#3457) new c1ed35411b Bump snappy-java from 1.1.9.1 to 1.1.10.1 (#3498) new c6024b2b62 Bump guava from 31.1-jre to 32.0.0-jre (#3497) new 9e8b59caa1 Update parent POM to 30 and remove contrib dir (#3550) new c38c10fec1 Bump ZooKeeper patch version new 67ca64eeb5 Merge branch '2.1' The 9 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: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[accumulo] branch 2.1 updated (313238b5e8 -> c38c10fec1)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.1 in repository https://gitbox.apache.org/repos/asf/accumulo.git from 313238b5e8 Roll up the manager's safe mode status indicator to the nav bar (#3561) new b59dfa9564 Add CI check to detect Thrift changes (#3362) new a07499e07a Minor POM quality updates (#3419) new 4f5d358dcc More build updates to reduce warnings (#3426) new 497d741f7a Update datasketches-java to 4.0.0 (#3457) new c1ed35411b Bump snappy-java from 1.1.9.1 to 1.1.10.1 (#3498) new c6024b2b62 Bump guava from 31.1-jre to 32.0.0-jre (#3497) new 9e8b59caa1 Update parent POM to 30 and remove contrib dir (#3550) new c38c10fec1 Bump ZooKeeper patch version The 8 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: .github/ISSUE_TEMPLATE/post_vote_checklist.md | 8 +- .github/workflows/maven-full-its.yaml | 2 +- .github/workflows/maven.yaml | 6 +- .github/workflows/scripts.yaml | 24 ++- README.md | 2 +- assemble/bin/accumulo-cluster | 1 - assemble/bin/accumulo-service | 1 - assemble/bin/accumulo-util | 1 - contrib/accumulo-logo.png | Bin 11427 -> 0 bytes contrib/javadoc11.patch| 91 -- contrib/scripts/check-tservers.py | 202 - core/pom.xml | 11 +- .../accumulo/core/file/rfile/GenerateSplits.java | 15 +- .../accumulo/core/metrics/MetricsProducer.java | 1 - .../core/util/ratelimit/GuavaRateLimiter.java | 10 +- .../core/util/ratelimit/NullRateLimiter.java | 2 +- .../accumulo/core/util/ratelimit/RateLimiter.java | 2 +- .../util/ratelimit/SharedRateLimiterFactory.java | 6 +- core/src/main/scripts/generate-thrift.sh | 2 +- .../src/main/scripts/mkdirs.sh | 15 +- minicluster/pom.xml| 4 + pom.xml| 176 -- .../accumulo/server/fs/VolumeManagerImpl.java | 17 +- server/monitor/pom.xml | 6 +- server/tserver/pom.xml | 2 +- {contrib => src/build}/ci/find-unapproved-chars.sh | 0 {contrib => src/build}/ci/find-unapproved-junit.sh | 0 {contrib => src/build}/ci/install-shfmt.sh | 0 .../build/ci/install-thrift.sh | 11 +- {contrib => src/build}/ci/it-matrix.sh | 0 {contrib => src/build}/ci/run-shellcheck.sh| 0 {contrib => src/build}/ci/run-shfmt.sh | 0 .../build/ci/run-thrift.sh | 15 +- .../build/eclipse-codestyle.xml| 0 {contrib => src/build}/license-header.txt | 0 src/site/site.xml | 44 - 36 files changed, 182 insertions(+), 495 deletions(-) delete mode 100644 contrib/accumulo-logo.png delete mode 100644 contrib/javadoc11.patch delete mode 100755 contrib/scripts/check-tservers.py copy contrib/ci/run-shellcheck.sh => core/src/main/scripts/mkdirs.sh (72%) rename {contrib => src/build}/ci/find-unapproved-chars.sh (100%) rename {contrib => src/build}/ci/find-unapproved-junit.sh (100%) rename {contrib => src/build}/ci/install-shfmt.sh (100%) copy contrib/ci/run-shellcheck.sh => src/build/ci/install-thrift.sh (60%) rename {contrib => src/build}/ci/it-matrix.sh (100%) copy {contrib => src/build}/ci/run-shellcheck.sh (100%) rename {contrib => src/build}/ci/run-shfmt.sh (100%) rename contrib/ci/run-shellcheck.sh => src/build/ci/run-thrift.sh (67%) rename contrib/Eclipse-Accumulo-Codestyle.xml => src/build/eclipse-codestyle.xml (100%) rename {contrib => src/build}/license-header.txt (100%) delete mode 100644 src/site/site.xml