(accumulo-website) branch main updated: Minor clean up on the downloads page (#444)
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 0ebd92cc6 Minor clean up on the downloads page (#444)
0ebd92cc6 is described below
commit 0ebd92cc6608da4329f70ed024d862cb382993b9
Author: Christopher Tubbs
AuthorDate: Wed Sep 18 21:01:44 2024 -0400
Minor clean up on the downloads page (#444)
* Add "Accumulo" before the raw version numbers, to distinguish from
other libraries/subprojects also listed on the page
* Clarify use of "Latest" and "Legacy" badges to indicate current and
previous generation of LTM releases when they overlap
* Use unique anchors for specific sections of the page
* Drop the links to the 1.10 LTM version whose maintenance window has
elapsed (will archive the corresponding artifacts in SVN)
---
pages/downloads.md | 43 +++
1 file changed, 7 insertions(+), 36 deletions(-)
diff --git a/pages/downloads.md b/pages/downloads.md
index b8accdf53..1c90822e2 100644
--- a/pages/downloads.md
+++ b/pages/downloads.md
@@ -72,8 +72,8 @@ Be sure to [verify your downloads][VERIFY_PROCEDURES] using
[these KEYS][GPG_KEY
## Current Releases
{% assign linkVers = '3.0.0' %}
-### {{linkVers}} **Latest**{: .badge .bg-primary} **non-LTM**{: .badge
.bg-warning}
-{: #latest }
+### Accumulo {{linkVers}} **non-LTM**{: .badge .bg-warning}
+{: #accumulo-nonltm }
The {{linkVers}} release of Apache Accumulo® is the latest bleeding edge
release, containing the newest features, bug fixes, performance enhancements,
@@ -105,8 +105,8 @@ available in a future update to this site.
{% assign linkVers = '2.1.3' %}
-### {{linkVers}} **Latest**{: .badge .bg-primary} **LTM**{: .badge .bg-success}
-{: #latest }
+### Accumulo {{linkVers}} **Latest**{: .badge .bg-primary} **LTM**{: .badge
.bg-success}
+{: #accumulo-latest-ltm }
The {{linkVers}} release of Apache Accumulo® is the latest release on the
current stable generation, containing the newest bug fixes, performance
@@ -134,38 +134,9 @@ enhancements, and more.
-{% assign linkVers = '1.10.4' %}
-### {{linkVers}} **Legacy**{: .badge .bg-secondary} **LTM**{: .badge
.bg-success}
-{: #legacy }
-
-The most recent legacy (1.x) release of Apache Accumulo® is version
-{{linkVers}}. This is the final release of the 1.10 series, which is now
-considered end-of-life. This means that code fixes that address bugs
-reported against this version will only be applied to future versions.
-
-{% for srcbin in srcbinArray %}
-{% assign lnkFile = 'accumulo-' | append: linkVers | append: '-' | append:
srcbin | append: '.tar.gz' %}
-{% assign lnkSuffix = '/accumulo/' | append: linkVers | append: '/' | append:
lnkFile %}
-
-
-{{lnkFile}}{{glyphSave}}
-
-
-ASC{{glyphLock}}
-SHA{{glyphLock}}
-
-
-{% endfor %}
-
- Release Notes
- https://github.com/apache/accumulo/blob/rel/{{linkVers}}/README.md";>README
- User
Manual
- Examples
- Java API
-
-
{% assign linkVers = '1.0.0-beta' %}
-### Accumulo Access {{linkVers}} **Latest**{: .badge .bg-primary}
+### Accumulo Access {{linkVers}}
+{: #accumulo-access }
The Accumulo Access library provides the same functionality, semantics, and
syntax as the
Accumulo ColumnVisibility and VisibilityEvaluator classes in a standalone java
library
@@ -188,7 +159,7 @@ that can be used separately from Accumulo.
**LTM**{: .badge .bg-success} / **non-LTM**{: .badge .bg-warning} indicates a
[Long Term Maintenance][LTM] release or not
-**Latest**{: .badge .bg-primary} / **Legacy**{: .badge .bg-secondary}
indicates the latest or previous generation
+**Latest**{: .badge .bg-primary} / **Legacy**{: .badge .bg-secondary}
indicates the latest or previous generation when two LTM releases are being
concurrently maintained
## Older releases
(accumulo-website) branch main updated: Adding Accumulo Access 1.0.0-beta to downloads page (#443)
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 9387c0ab1 Adding Accumulo Access 1.0.0-beta to downloads page (#443)
9387c0ab1 is described below
commit 9387c0ab1cbdb7f9248b248ba6da612b6157ae08
Author: Dave Marion
AuthorDate: Tue Sep 17 21:41:17 2024 -0400
Adding Accumulo Access 1.0.0-beta to downloads page (#443)
---
pages/downloads.md | 18 ++
1 file changed, 18 insertions(+)
diff --git a/pages/downloads.md b/pages/downloads.md
index c33cfb2b4..b8accdf53 100644
--- a/pages/downloads.md
+++ b/pages/downloads.md
@@ -164,6 +164,24 @@ reported against this version will only be applied to
future versions.
Java API
+{% assign linkVers = '1.0.0-beta' %}
+### Accumulo Access {{linkVers}} **Latest**{: .badge .bg-primary}
+
+The Accumulo Access library provides the same functionality, semantics, and
syntax as the
+Accumulo ColumnVisibility and VisibilityEvaluator classes in a standalone java
library
+that can be used separately from Accumulo.
+
+{% assign lnkFile = 'accumulo-access-' | append: linkVers | append: '-' |
append: 'source-release' | append: '.tar.gz' %}
+{% assign lnkSuffix = '/accumulo/accumulo-access/' | append: linkVers |
append: '/' | append: lnkFile %}
+
+
+{{lnkFile}}{{glyphSave}}
+
+
+ASC{{glyphLock}}
+SHA{{glyphLock}}
+
+
## Legend
{: #legend }
(accumulo-website) branch main updated: Update gems
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 56da8eba5 Update gems 56da8eba5 is described below commit 56da8eba522f0b539cd119739b47dcdb88f20154 Author: Christopher Tubbs AuthorDate: Tue Sep 17 18:00:36 2024 -0400 Update gems --- Gemfile.lock | 97 +--- 1 file changed, 87 insertions(+), 10 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 8880168b0..32593f2bd 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -9,13 +9,28 @@ GEM eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) +ffi (1.17.0) +ffi (1.17.0-aarch64-linux-gnu) +ffi (1.17.0-aarch64-linux-musl) +ffi (1.17.0-arm-linux-gnu) +ffi (1.17.0-arm-linux-musl) +ffi (1.17.0-arm64-darwin) +ffi (1.17.0-x86-linux-gnu) +ffi (1.17.0-x86-linux-musl) +ffi (1.17.0-x86_64-darwin) ffi (1.17.0-x86_64-linux-gnu) +ffi (1.17.0-x86_64-linux-musl) forwardable-extended (2.6.0) +google-protobuf (3.25.3) +google-protobuf (3.25.3-aarch64-linux) +google-protobuf (3.25.3-arm64-darwin) +google-protobuf (3.25.3-x86-linux) +google-protobuf (3.25.3-x86_64-darwin) google-protobuf (3.25.3-x86_64-linux) http_parser.rb (0.8.0) -i18n (1.14.5) +i18n (1.14.6) concurrent-ruby (~> 1.0) -jekyll (4.3.3) +jekyll (4.3.4) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) @@ -52,20 +67,82 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) -rexml (3.3.6) - strscan -rouge (4.3.0) +rexml (3.3.7) +rouge (4.4.0) safe_yaml (1.0.5) +sass-embedded (1.77.5-aarch64-linux-android) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-aarch64-linux-gnu) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-aarch64-linux-musl) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-aarch64-mingw-ucrt) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-arm-linux-androideabi) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-arm-linux-gnueabihf) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-arm-linux-musleabihf) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-arm64-darwin) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-riscv64-linux-android) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-riscv64-linux-gnu) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-riscv64-linux-musl) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-x86-cygwin) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-x86-linux-android) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-x86-linux-gnu) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-x86-linux-musl) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-x86-mingw-ucrt) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-x86_64-cygwin) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-x86_64-darwin) + google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.5-x86_64-linux-android) + google-protobuf (>= 3.25, < 5.0) sass-embedded (1.77.5-x86_64-linux-gnu) google-protobuf (>= 3.25, < 5.0) -strscan (3.1.0) +sass-embedded (1.77.5-x86_64-linux-musl) + google-protobuf (>= 3.25, < 5.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) -unicode-display_width (2.5.0) +unicode-display_width (2.6.0) webrick (1.8.1) PLATFORMS - x86_64-linux + aarch64-linux + aarch64-linux-android + aarch64-linux-gnu + aarch64-linux-musl + aarch64-mingw-ucrt + arm-linux-androideabi + arm-linux-gnu + arm-linux-gnueabihf + arm-linux-musl + arm-linux-musleabihf + arm64-darwin + riscv64-linux-android + riscv64-linux-gnu + riscv64-linux-musl + x86-cygwin + x86-linux + x86-linux-android + x86-linux-gnu + x86-linux-musl + x86-mingw-ucrt + x86_64-cygwin + x86_64-darwin + x86_64-linux-android + x86_64-linux-gnu + x86_64-linux-musl DEPENDENCIES google-protobuf (= 3.25.3) @@ -74,7 +151,7 @@ DEPENDENCIES webrick (~> 1.7) RUBY VERSION - ruby 3.2.2p53 + ruby 3.3.4p94 BUNDLED WITH - 2.4.10 + 2.5.11
(accumulo-website) branch main updated: Bump rexml from 3.3.5 to 3.3.6 (#440)
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 f53ec7a28 Bump rexml from 3.3.5 to 3.3.6 (#440) f53ec7a28 is described below commit f53ec7a28ac045ff6b7b6e1ebcbb2be25c2c1541 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Sep 4 13:21:29 2024 -0400 Bump rexml from 3.3.5 to 3.3.6 (#440) Bumps [rexml](https://github.com/ruby/rexml) from 3.3.5 to 3.3.6. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.5...v3.3.6) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 7d4df355b..8880168b0 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,7 +52,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) -rexml (3.3.5) +rexml (3.3.6) strscan rouge (4.3.0) safe_yaml (1.0.5)
(accumulo) branch main updated (3ab133cef0 -> df8a3670a4)
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 3ab133cef0 Merge branch '3.1' add 1d365a9089 Add UTF-8 charsets to String/Byte conversions in main (#4847) new df8a3670a4 Merge branch '3.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: .../java/org/apache/accumulo/core/file/rfile/AbstractRFileTest.java | 4 +++- .../apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java | 2 +- .../java/org/apache/accumulo/hadoop/its/mapreduce/MapReduceIT.java | 5 +++-- .../minicluster/MiniAccumuloClusterExistingZooKeepersTest.java | 3 ++- .../accumulo/manager/compaction/CompactionCoordinatorTest.java | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-)
(accumulo) 01/01: Merge branch '3.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 df8a3670a4100bee083a02d6ac6f45ff36ffe8f6 Merge: 3ab133cef0 1d365a9089 Author: Christopher Tubbs AuthorDate: Wed Aug 28 17:53:16 2024 -0400 Merge branch '3.1' .../java/org/apache/accumulo/core/file/rfile/AbstractRFileTest.java | 4 +++- .../apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java | 2 +- .../java/org/apache/accumulo/hadoop/its/mapreduce/MapReduceIT.java | 5 +++-- .../minicluster/MiniAccumuloClusterExistingZooKeepersTest.java | 3 ++- .../accumulo/manager/compaction/CompactionCoordinatorTest.java | 3 ++- 5 files changed, 11 insertions(+), 6 deletions(-) diff --cc server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java index 90c100aa72,00..9967610691 mode 100644,00..100644 --- a/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java +++ b/server/manager/src/test/java/org/apache/accumulo/manager/compaction/CompactionCoordinatorTest.java @@@ -1,617 -1,0 +1,618 @@@ +/* + * 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. + */ +package org.apache.accumulo.manager.compaction; + ++import static java.nio.charset.StandardCharsets.UTF_8; +import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.ECOMP; +import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.OPID; +import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.SELECTED; +import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.USER_COMPACTION_REQUESTED; +import static org.apache.accumulo.manager.compaction.coordinator.CompactionCoordinator.canReserveCompaction; +import static org.easymock.EasyMock.anyObject; +import static org.easymock.EasyMock.createMock; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.expectLastCall; +import static org.easymock.EasyMock.replay; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Optional; +import java.util.Set; +import java.util.UUID; +import java.util.concurrent.ScheduledThreadPoolExecutor; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Collectors; + +import org.apache.accumulo.core.client.admin.CompactionConfig; +import org.apache.accumulo.core.clientImpl.thrift.TInfo; +import org.apache.accumulo.core.clientImpl.thrift.ThriftSecurityException; +import org.apache.accumulo.core.compaction.thrift.TExternalCompaction; +import org.apache.accumulo.core.compaction.thrift.TNextCompactionJob; +import org.apache.accumulo.core.conf.DefaultConfiguration; +import org.apache.accumulo.core.conf.Property; +import org.apache.accumulo.core.data.TableId; +import org.apache.accumulo.core.dataImpl.KeyExtent; +import org.apache.accumulo.core.dataImpl.thrift.TKeyExtent; +import org.apache.accumulo.core.fate.Fate; +import org.apache.accumulo.core.fate.FateId; +import org.apache.accumulo.core.fate.FateInstanceType; +import org.apache.accumulo.core.iteratorsImpl.system.SystemIteratorUtil; +import org.apache.accumulo.core.manager.state.tables.TableState; +import org.apache.accumulo.core.metadata.CompactableFileImpl; +import org.apache.accumulo.core.metadata.ReferencedTabletFile; +import org.apache.accumulo.core.metadata.StoredTabletFile; +import org.apache.accumulo.core.metadata.schema.CompactionMetadata; +import org.apache.accumulo.core.metadata.schema.DataFileValue; +import org.apache.accumulo.core.metadata.schema.ExternalCompactionId; +import org.apache.accumulo.core.metadata.
(accumulo) branch 3.1 updated: Add UTF-8 charsets to String/Byte conversions in main (#4847)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch 3.1
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/3.1 by this push:
new 1d365a9089 Add UTF-8 charsets to String/Byte conversions in main
(#4847)
1d365a9089 is described below
commit 1d365a9089ad00420a197615ec01026616ccb499
Author: John K <69256191+meatballspaghe...@users.noreply.github.com>
AuthorDate: Wed Aug 28 17:50:21 2024 -0400
Add UTF-8 charsets to String/Byte conversions in main (#4847)
- Apply same changes to code in main branch that was not
covered in 2.1:
- Add UTF-8 charset to String.getBytes calls.
- Add UTF-8 charset to new String constructions that use a
byte[] as argument.
Fixes #4765
---
.../java/org/apache/accumulo/core/file/rfile/AbstractRFileTest.java | 4 +++-
.../apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java | 2 +-
.../java/org/apache/accumulo/hadoop/its/mapreduce/MapReduceIT.java | 5 +++--
.../minicluster/MiniAccumuloClusterExistingZooKeepersTest.java | 3 ++-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git
a/core/src/test/java/org/apache/accumulo/core/file/rfile/AbstractRFileTest.java
b/core/src/test/java/org/apache/accumulo/core/file/rfile/AbstractRFileTest.java
index 26d7a4baf5..a5fc04a854 100644
---
a/core/src/test/java/org/apache/accumulo/core/file/rfile/AbstractRFileTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/file/rfile/AbstractRFileTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.accumulo.core.file.rfile;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -237,7 +238,8 @@ public abstract class AbstractRFileTest {
}
static Key newKey(String row, String cf, String cq, String cv, long ts) {
-return new Key(row.getBytes(), cf.getBytes(), cq.getBytes(),
cv.getBytes(), ts);
+return new Key(row.getBytes(UTF_8), cf.getBytes(UTF_8),
cq.getBytes(UTF_8), cv.getBytes(UTF_8),
+ts);
}
static Value newValue(String val) {
diff --git
a/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
b/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
index 57f19f6de7..b1db38be7f 100644
---
a/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
+++
b/core/src/test/java/org/apache/accumulo/core/iterators/user/IndexedDocIteratorTest.java
@@ -129,7 +129,7 @@ public class IndexedDocIteratorTest {
}
}
sb.append(" docID=").append(doc);
-Key k = new Key(row, docColf, new Text(String.format("%010d",
docid).getBytes()));
+Key k = new Key(row, docColf, new Text(String.format("%010d",
docid).getBytes(UTF_8)));
map.put(k, new Value(sb.toString()));
}
}
diff --git
a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/MapReduceIT.java
b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/MapReduceIT.java
index 52b66fab48..8512136f8e 100644
---
a/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/MapReduceIT.java
+++
b/hadoop-mapreduce/src/test/java/org/apache/accumulo/hadoop/its/mapreduce/MapReduceIT.java
@@ -18,6 +18,7 @@
*/
package org.apache.accumulo.hadoop.its.mapreduce;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertEquals;
import java.io.IOException;
@@ -95,8 +96,8 @@ public class MapReduceIT extends ConfigurableMacBase {
int i = 0;
for (Entry entry : s) {
MessageDigest md = MessageDigest.getInstance("MD5");
-byte[] check = Base64.getEncoder().encode(md.digest(("row" +
i).getBytes()));
-assertEquals(entry.getValue().toString(), new String(check));
+byte[] check = Base64.getEncoder().encode(md.digest(("row" +
i).getBytes(UTF_8)));
+assertEquals(entry.getValue().toString(), new String(check, UTF_8));
i++;
}
}
diff --git
a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
index fdff86ee3e..c428127b58 100644
---
a/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
+++
b/minicluster/src/test/java/org/apache/accumulo/minicluster/MiniAccumuloClusterExistingZooKeepersTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.accumulo.minicluster;
+import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.jupiter.api.Assertions.assertEquals;
import sta
(accumulo) branch elasticity deleted (was e8446a2f18)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git was e8446a2f18 Mark member variables as final in core (#4834) The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(accumulo) branch elasticity updated (fa4b73f0f9 -> aecd11f81c)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from fa4b73f0f9 Merge Timer/CountdownTimer/NanoTime changes into elasticity (#4821) new 23a921726d Revert "Merge Timer/CountdownTimer/NanoTime changes into elasticity (#4821)" add 7deced8f5f Remove NanoTime object in favor of new Timer and CountdownTimer object (#4785) add 5908843e94 Remove Timer.startNewWithOffset() methods (#4818) add b6746488d9 Merge remote-tracking branch 'upstream/2.1' into main add 9e079dbbeb Bump Hadoop version from 3.3.6 to 3.4.0 (#4812) new aecd11f81c Merge branch 'main' into elasticity 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. Summary of changes: pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
(accumulo) 02/02: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit aecd11f81ccda36726b133b601ca5adad73eca58
Merge: 23a921726d 9e079dbbeb
Author: Christopher Tubbs
AuthorDate: Fri Aug 23 11:25:49 2024 -0400
Merge branch 'main' into elasticity
Redo/fix merge of #4821
.../core/clientImpl/ClientTabletCache.java | 11 +-
.../core/clientImpl/ClientTabletCacheImpl.java | 33 +++--
.../java/org/apache/accumulo/core/fate/Fate.java | 10 +-
.../org/apache/accumulo/core/lock/ServiceLock.java | 9 +-
.../java/org/apache/accumulo/core/util/Timer.java | 25
.../util/compaction/ExternalCompactionUtil.java| 7 +-
.../apache/accumulo/core/util/time/NanoTime.java | 104 -
.../org/apache/accumulo/core/util/TimerTest.java | 34 -
.../accumulo/core/util/time/NanoTimeTest.java | 162 -
pom.xml| 2 +-
.../accumulo/server/compaction/FileCompactor.java | 14 +-
.../org/apache/accumulo/compactor/Compactor.java | 6 +-
.../apache/accumulo/gc/SimpleGarbageCollector.java | 9 +-
.../java/org/apache/accumulo/manager/Manager.java | 6 +-
.../availability/SetTabletAvailability.java| 8 +-
.../manager/tableOps/merge/ReserveTablets.java | 7 +-
.../org/apache/accumulo/tserver/ScanServer.java| 6 +-
.../accumulo/tserver/UnloadTabletHandler.java | 6 +-
18 files changed, 73 insertions(+), 386 deletions(-)
diff --cc
core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
index a31ca2418b,00..5a23cad2d4
mode 100644,00..100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
@@@ -1,426 -1,0 +1,429 @@@
+/*
+ * 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.
+ */
+package org.apache.accumulo.core.clientImpl;
+
+import static com.google.common.base.Preconditions.checkArgument;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.function.BiConsumer;
+
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.InvalidTabletHostingRequestException;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.admin.TabletAvailability;
+import org.apache.accumulo.core.data.InstanceId;
+import org.apache.accumulo.core.data.Mutation;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.data.TableId;
+import org.apache.accumulo.core.dataImpl.KeyExtent;
+import org.apache.accumulo.core.metadata.AccumuloTable;
+import org.apache.accumulo.core.metadata.MetadataCachedTabletObtainer;
+import org.apache.accumulo.core.singletons.SingletonManager;
+import org.apache.accumulo.core.singletons.SingletonService;
+import org.apache.accumulo.core.util.Interner;
++import org.apache.accumulo.core.util.Timer;
+import org.apache.accumulo.core.util.UtilWaitThread;
- import org.apache.accumulo.core.util.time.NanoTime;
+import org.apache.hadoop.io.Text;
+
+import com.google.common.base.Preconditions;
+
+/**
+ * Client side cache of information about Tablets. Currently, a tablet prev
end row is cached and
+ * locations are cached if they exist.
+ */
+public abstract class ClientTabletCache {
+
+ /**
+ * Flipped false on call to {@link #clearInstances}. Checked by client
classes that locally cache
+ * Locators.
+ */
+ private volatile boolean isValid = true;
+
+ boolean isValid() {
+return isValid;
+ }
+
+ /**
+ * Used to indicate if a user of this interface needs a tablet with a
location. This simple enum
+ * was created instead of using a boolean for code clarity.
+ */
+ public enum LocationNeed {
+REQUIRED, NOT_REQUIRE
(accumulo) 01/02: Revert "Merge Timer/CountdownTimer/NanoTime changes into elasticity (#4821)"
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 23a921726dc866c926ed389c06beaf4bd0512d8f
Author: Christopher Tubbs
AuthorDate: Fri Aug 23 11:22:38 2024 -0400
Revert "Merge Timer/CountdownTimer/NanoTime changes into elasticity (#4821)"
This reverts commit fa4b73f0f9b7d3707bf04c603ae79d5c2dccd55e.
---
.../core/clientImpl/ClientTabletCache.java | 11 +-
.../core/clientImpl/ClientTabletCacheImpl.java | 33 ++---
.../java/org/apache/accumulo/core/fate/Fate.java | 10 +-
.../org/apache/accumulo/core/lock/ServiceLock.java | 9 +-
.../java/org/apache/accumulo/core/util/Timer.java | 25
.../util/compaction/ExternalCompactionUtil.java| 7 +-
.../apache/accumulo/core/util/time/NanoTime.java | 104 +
.../org/apache/accumulo/core/util/TimerTest.java | 34 +
.../accumulo/core/util/time/NanoTimeTest.java | 162 +
.../accumulo/server/compaction/FileCompactor.java | 14 +-
.../org/apache/accumulo/compactor/Compactor.java | 6 +-
.../apache/accumulo/gc/SimpleGarbageCollector.java | 9 +-
.../java/org/apache/accumulo/manager/Manager.java | 6 +-
.../availability/SetTabletAvailability.java| 8 +-
.../manager/tableOps/merge/ReserveTablets.java | 7 +-
.../org/apache/accumulo/tserver/ScanServer.java| 6 +-
.../accumulo/tserver/UnloadTabletHandler.java | 6 +-
17 files changed, 385 insertions(+), 72 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
index 5a23cad2d4..a31ca2418b 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCache.java
@@ -44,8 +44,8 @@ import
org.apache.accumulo.core.metadata.MetadataCachedTabletObtainer;
import org.apache.accumulo.core.singletons.SingletonManager;
import org.apache.accumulo.core.singletons.SingletonService;
import org.apache.accumulo.core.util.Interner;
-import org.apache.accumulo.core.util.Timer;
import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.core.util.time.NanoTime;
import org.apache.hadoop.io.Text;
import com.google.common.base.Preconditions;
@@ -311,7 +311,7 @@ public abstract class ClientTabletCache {
private final TabletAvailability availability;
private final boolean hostingRequested;
-private final Timer creationTimer = Timer.startNew();
+private final NanoTime creationTime = NanoTime.now();
public CachedTablet(KeyExtent tablet_extent, String tablet_location,
String session,
TabletAvailability availability, boolean hostingRequested) {
@@ -392,11 +392,8 @@ public abstract class ClientTabletCache {
return this.availability;
}
-/**
- * @return a timer that was started when this object was created
- */
-public Timer getCreationTimer() {
- return creationTimer;
+public NanoTime getCreationTime() {
+ return creationTime;
}
public boolean wasHostingRequested() {
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCacheImpl.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCacheImpl.java
index 7aa10260cb..7f3de5819c 100644
---
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCacheImpl.java
+++
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientTabletCacheImpl.java
@@ -19,7 +19,6 @@
package org.apache.accumulo.core.clientImpl;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
-import static java.util.concurrent.TimeUnit.NANOSECONDS;
import java.time.Duration;
import java.util.ArrayList;
@@ -61,6 +60,7 @@ import org.apache.accumulo.core.trace.TraceUtil;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.accumulo.core.util.Timer;
+import org.apache.accumulo.core.util.time.NanoTime;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparator;
import org.slf4j.Logger;
@@ -238,14 +238,14 @@ public class ClientTabletCacheImpl extends
ClientTabletCache {
// Want to ignore any entries in the cache w/o a location that were
created before the
// following time. Entries created after the following time may have
been populated by the
// following loop, and we want to use those.
-Timer cacheCutoffTimer = Timer.startNew();
+var cacheCutoff = NanoTime.now();
for (T mutation : notInCache) {
row.set(mutation.getRow());
CachedTablet tl = _findTablet(context, row, false, false, false,
lcSession,
- LocationNeed.REQUIRED, cacheCutoffTimer);
+ LocationNee
(accumulo-website) branch main updated: Indicate restart required for additional props
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 b629bc413 Indicate restart required for additional props b629bc413 is described below commit b629bc4133d23595832971bf4fcd3e4261771a82 Author: Christopher Tubbs AuthorDate: Wed Aug 14 21:35:02 2024 -0400 Indicate restart required for additional props Update the generated server-properties.md to indicate that some additional properties require restart to take effect. The generated documentation for these were fixed after 2.1.3 was released, so this change is to update the docs from the 2.1.4-SNAPSHOT build after apache/accumulo#4780 was merged. This fixes #438 --- _docs-2/configuration/server-properties.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_docs-2/configuration/server-properties.md b/_docs-2/configuration/server-properties.md index ced260310..167bf52bf 100644 --- a/_docs-2/configuration/server-properties.md +++ b/_docs-2/configuration/server-properties.md @@ -321,8 +321,8 @@ Below are properties set in `accumulo.properties` or the Accumulo shell that con | tserver.server.threadcheck.time | **Available since:** 1.4.0The time between adjustments of the server thread pool.**type:** TIMEDURATION, **zk mutable:** yes, **default value:** `1s` | | tserver.server.threads.minimum | **Available since:** 1.4.0The minimum number of threads to use to handle incoming requests.**type:** COUNT, **zk mutable:** yes but requires restart of the tserver, **default value:** `20` | | tserver.server.threads.timeout | **Available since:** 2.1.0The time after which incoming request threads terminate with no work available. Zero (0) will keep the threads alive indefinitely.**type:** TIMEDURATION, **zk mutable:** yes but requires restart of the tserver, **default value:** `0s` | -| tserver.session.idle.max | **Available since:** 1.3.5When a tablet server's SimpleTimer thread triggers to check idle sessions, this configurable option will be used to evaluate scan sessions to determine if they can be closed due to inactivity.**type:** TIMEDURATION, **zk mutable:** yes, **default value:** `1m` | -| tserver.session.update.idle.max | **Available since:** 1.6.5When a tablet server's SimpleTimer thread triggers to check idle sessions, this configurable option will be used to evaluate update sessions to determine if they can be closed due to inactivity.**type:** TIMEDURATION, **zk mutable:** yes, **default value:** `1m` | +| tserver.session.idle.max | **Available since:** 1.3.5When a tablet server's SimpleTimer thread triggers to check idle sessions, this configurable option will be used to evaluate scan sessions to determine if they can be closed due to inactivity.**type:** TIMEDURATION, **zk mutable:** yes but requires restart of the tserver, **default value:** `1m` | +| tserver.session.update.idle.max | **Available since:** 1.6.5When a tablet server's SimpleTimer thread triggers to check idle sessions, this configurable option will be used to evaluate update sessions to determine if they can be closed due to inactivity.**type:** TIMEDURATION, **zk mutable:** yes but requires restart of the tserver, **default value:** `1m` | | tserver.slow.filepermit.time | **Available since:** 1.9.3If a thread blocks more than this period of time waiting to get file permits, debugging information will be written.**type:** TIMEDURATION, **zk mutable:** yes, **default value:** `100ms` | | tserver.slow.flush.time | **Available since:** 1.8.0If a flush to the write-ahead log takes longer than this period of time, debugging information will written, and may result in a log rollover.**type:** TIMEDURATION, **zk mutable:** yes, **default value:** `100ms` | | ~~ tserver.sort.buffer.size~~ | **Available since:** 1.5.0*Deprecated since:* 2.1.0*Replaced by:* tserver.wal.sort.buffer.size~~The amount of memory to use when sorting logs during recovery.**type:** MEMORY~~, ~~**zk mutable:** yes~~, ~~**default value:** `10%`~~ |
(accumulo-website) branch main updated: Add suggested typo fixes to 2.1.3 release notes
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 25864b2c8 Add suggested typo fixes to 2.1.3 release notes
25864b2c8 is described below
commit 25864b2c8358dc3c76dc39967b950d83d9aa3324
Author: Christopher Tubbs
AuthorDate: Tue Aug 13 19:18:13 2024 -0400
Add suggested typo fixes to 2.1.3 release notes
Add suggestions sent to me from @DomGarguilo
-
Co-authored-by: Dom G.
---
_posts/release/2024-08-12-accumulo-2.1.3.md | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/_posts/release/2024-08-12-accumulo-2.1.3.md
b/_posts/release/2024-08-12-accumulo-2.1.3.md
index 054b1ee1b..c1480132d 100644
--- a/_posts/release/2024-08-12-accumulo-2.1.3.md
+++ b/_posts/release/2024-08-12-accumulo-2.1.3.md
@@ -11,8 +11,8 @@ fixes and minor enhancements. This version supersedes 2.1.2.
Users upgrading to
## Notable Changes
-The full set of changes are too numerous to be useful here. Included here are
some highlights of the
-most interesting bugs fixed and features added in 2.1.3. For the full set of
changes, please see the
+The full set of changes are too numerous to be useful here. Below are some
highlights of the most
+significant bug fixes and features added in 2.1.3. For the full set of
changes, please see the
commit history or issue tracker milestone links below.
### Configurable Improvements
@@ -38,8 +38,8 @@ or existing properties to improve system performance or
behavior. These include:
`scan.server.selector.impl` client property called
`org.apache.accumulo.core.spi.scan.ConfigurableScanServerHostSelector` that
tries to use scan
servers on the same host to leverage shared off-heap-cache usage.
-* {% ghi 3737 %},{% ghi 3783 %} Addressed some common transport layer errors
about max message sizes
- being exceeded. The max message size configuration was greatly simplified by
removing any
+* {% ghi 3737 %}, {% ghi 3783 %} Addressed some common transport layer errors
about max message
+ sizes being exceeded. The max message size configuration was greatly
simplified by removing any
experimental max message size properties, and deprecating the other
non-experimental ones, all in
favor of a new common single property, {% plink rpc.message.size.max %}, for
all server types. The
default value is now very large to avoid users experiencing errors, but can
be constrained by
@@ -88,9 +88,9 @@ ways, but are not directly configurable by the user. These
include:
plugin environment.
* {% ghi 3721 %} Fixed an issue with writes happening in a retry after batch
writer was closed. This
strengthens metadata consistency.
-* {% ghi 3749 %},{% ghi 3750 %} Fixed an issue where deleting a compaction
pool with running
+* {% ghi 3749 %}, {% ghi 3750 %} Fixed an issue where deleting a compaction
pool with running
compactions would leave the tserver in a bad state.
-* {% ghi 3748 %} Fixed a bug where a wal could remained locked if an exception
occurred.
+* {% ghi 3748 %} Fixed a bug where a wal could remain locked if an exception
occurred.
* {% ghi 608 %}, {% ghi 3755 %} Add validation to GC that checks that the
scanner used by GC to
determine candidates for deletion returned a complete row as a mitigation
for {% ghi 608 %} which
observed referenced files being removed when they are still in use.
@@ -100,17 +100,17 @@ ways, but are not directly configurable by the user.
These include:
* {% ghi 4117 %} Fixed a bug in compaction properties where the replacement
`maxOpen` property was
being ignored in favor of the deprecated `open.max` property.
* {% ghi 4681 %} Stopped listing all compactors in each compactor to reduce
load on Zookeeper.
-* {% ghi 3966 %} Changed the default value of the the property
- {% plink table.majc.compaction.strategy %} to empty string to fix a
compatibility bug with old and
- new compaction plugins.
+* {% ghi 3966 %} Changed the default value of the property
+ {% plink table.majc.compaction.strategy %} to an empty string to fix a
compatibility bug with old
+ and new compaction plugins.
* {% ghi 4554 %} Fixed a race condition that could cause duplicate compactions
to run. While
harmless in terms of data, the duplicate compactions could waste significant
compute resources.
* {% ghi 4127 %} Updated new compaction plugins to honor {% plink
table.file.max %} property using a
much more efficient algorithm than old compaction plugins had for this
property.
-* {% ghi 4485 %} Interrupt compactions on tablet unload. This prevents long
running compactions from
+* {% ghi 4485 %} Interrupt compactions on tablet unload. This prevents
long-running compactions from
blocking tablet migration.
* {% ghi 3512 %} Fixed an issue with improperly cleaned up scans
(accumulo-website) branch main updated: Update release notes for 2.1.3
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 7ed75fcda Update release notes for 2.1.3
7ed75fcda is described below
commit 7ed75fcdaac7f9d1cb2cf98defd789eb5bd9f954
Author: Christopher Tubbs
AuthorDate: Tue Aug 13 18:07:55 2024 -0400
Update release notes for 2.1.3
* Update gems
* Fix links to javadoc.io
* Remove draft status from 2.1.3 release notes
* Line wrap items
* Remove some internal, non-user facing items from the notes
* Add some missing notable items
* Organize items by configurability, observable behavior, bug fix,
metrics, and other
* Add note about JDK 17 requirement for the build
* Add link to the git history
---
Gemfile.lock| 6 +-
_config.yml | 4 +-
_posts/release/2024-08-12-accumulo-2.1.3.md | 233
3 files changed, 142 insertions(+), 101 deletions(-)
diff --git a/Gemfile.lock b/Gemfile.lock
index 8b40c8c78..7d4df355b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,14 +4,14 @@ GEM
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
colorator (1.1.0)
-concurrent-ruby (1.3.3)
+concurrent-ruby (1.3.4)
em-websocket (0.5.3)
eventmachine (>= 0.12.9)
http_parser.rb (~> 0)
eventmachine (1.2.7)
ffi (1.17.0-x86_64-linux-gnu)
forwardable-extended (2.6.0)
-google-protobuf (3.25.3)
+google-protobuf (3.25.3-x86_64-linux)
http_parser.rb (0.8.0)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
@@ -52,7 +52,7 @@ GEM
rb-fsevent (0.11.2)
rb-inotify (0.11.1)
ffi (~> 1.0)
-rexml (3.3.3)
+rexml (3.3.5)
strscan
rouge (4.3.0)
safe_yaml (1.0.5)
diff --git a/_config.yml b/_config.yml
index 791ea7af1..7aa94713c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -16,7 +16,7 @@ url: "https://accumulo.apache.org"; # the base hostname &
protocol for your site
latest_release: 2.1.3
javadoc_version: 2.1.3
num_home_posts: 5
-javadoc_base: "https://static.javadoc.io/org.apache.accumulo";
+javadoc_base: "https://www.javadoc.io/static/org.apache.accumulo";
docs_baseurl: "/docs/2.x"
# Build settings
@@ -75,7 +75,7 @@ defaults:
latest_release: "2.1.3"
javadoc_version: "2.1.3"
docs_baseurl: "/docs/2.x"
- javadoc_base: "https://static.javadoc.io/org.apache.accumulo";
+ javadoc_base: "https://www.javadoc.io/static/org.apache.accumulo";
skiph1fortitle: "true"
gh_branch: "main"
diff --git a/_posts/release/2024-08-12-accumulo-2.1.3.md
b/_posts/release/2024-08-12-accumulo-2.1.3.md
index cf934d7f1..054b1ee1b 100644
--- a/_posts/release/2024-08-12-accumulo-2.1.3.md
+++ b/_posts/release/2024-08-12-accumulo-2.1.3.md
@@ -1,7 +1,6 @@
---
title: Apache Accumulo 2.1.3
sortableversion: '02.01.03'
-draft: true
LTM: true
---
## About
@@ -10,115 +9,155 @@ Apache Accumulo 2.1.3 is a patch release of the 2.1 LTM
line. It contains bug
fixes and minor enhancements. This version supersedes 2.1.2. Users upgrading to
2.1 should upgrade directly to this version instead of 2.1.2.
-Included here are some highlights of the most interesting bugs fixed and
-features added in 2.1.3. For the full set of changes, please see the commit
-history or issue tracker.
+## Notable Changes
-### Notable Improvements
+The full set of changes are too numerous to be useful here. Included here are
some highlights of the
+most interesting bugs fixed and features added in 2.1.3. For the full set of
changes, please see the
+commit history or issue tracker milestone links below.
-Improvements that affect performance:
+### Configurable Improvements
+
+Many notable improvements have been added that include a means for users to
configure them via new
+or existing properties to improve system performance or behavior. These
include:
* {% ghi 3722 %} Adds properties {% plink
general.file.name.allocation.batch.size.min %} and
- {% plink general.file.name.allocation.batch.size.max%} that allow the batch
size
- for unique filename allocation in ZooKeeper to be configurable. In a system
that requires large numbers
- of unique names, larger batch sizes can reduce ZooKeeper contention because
more file names can be
+ {% plink general.file.name.allocation.batch.size.max%} that allow the batch
size for unique
+ filename allocation in ZooKeeper to be configurable. In a system that
requires large numbers of
+ unique names, larger batch sizes can reduce ZooKeeper contention because
more file names can be
reserved with a single ZooKeeper call.
-* {% ghi 3733 %} Avoid creating server side threads
svn commit: r70823 - /release/accumulo/2.1.2/
Author: ctubbsii Date: Tue Aug 13 00:02:06 2024 New Revision: 70823 Log: Archive the Accumulo 2.1.2 release artifacts Removed: release/accumulo/2.1.2/
(accumulo-website) branch main updated: Update website for 2.1.3 release
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 abd9bc0b6 Update website for 2.1.3 release
abd9bc0b6 is described below
commit abd9bc0b69844aa5f9c090c81f0a44030eaf19e1
Author: Christopher Tubbs
AuthorDate: Mon Aug 12 19:57:00 2024 -0400
Update website for 2.1.3 release
* Update jekyll config, nav, and download page
* Update 2.1.2 release notes to be archived
* Keep 2.1.3 release notes draft pending final review
---
_config.yml | 8
_includes/nav.html| 2 +-
_posts/release/2023-08-21-accumulo-2.1.2.md | 1 +
...{2024-07-10-accumulo-2.1.3.md => 2024-08-12-accumulo-2.1.3.md} | 0
pages/downloads.md| 2 +-
5 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/_config.yml b/_config.yml
index 5baea8d58..791ea7af1 100644
--- a/_config.yml
+++ b/_config.yml
@@ -13,8 +13,8 @@ description: > # this means to ignore newlines until "url:"
The Apache Accumulo™ sorted, distributed key/value store is a robust,
scalable,
high performance data storage and retrieval system.
url: "https://accumulo.apache.org"; # the base hostname & protocol for your site
-latest_release: 2.1.2
-javadoc_version: 2.1.2
+latest_release: 2.1.3
+javadoc_version: 2.1.3
num_home_posts: 5
javadoc_base: "https://static.javadoc.io/org.apache.accumulo";
docs_baseurl: "/docs/2.x"
@@ -72,8 +72,8 @@ defaults:
layout: "docs-2"
title_prefix: "Accumulo Documentation - "
version: "2.x"
- latest_release: "2.1.2"
- javadoc_version: "2.1.2"
+ latest_release: "2.1.3"
+ javadoc_version: "2.1.3"
docs_baseurl: "/docs/2.x"
javadoc_base: "https://static.javadoc.io/org.apache.accumulo";
skiph1fortitle: "true"
diff --git a/_includes/nav.html b/_includes/nav.html
index b91ca14e4..68ce22a85 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -14,7 +14,7 @@
Releases
3.0.0 (Latest non-LTM)
-2.1.2 (Latest LTM)
+2.1.3 (Latest LTM)
1.10.4 (Legacy LTM)
Archive
diff --git a/_posts/release/2023-08-21-accumulo-2.1.2.md
b/_posts/release/2023-08-21-accumulo-2.1.2.md
index 0eb3b3ab2..274276c59 100644
--- a/_posts/release/2023-08-21-accumulo-2.1.2.md
+++ b/_posts/release/2023-08-21-accumulo-2.1.2.md
@@ -2,6 +2,7 @@
title: Apache Accumulo 2.1.2
sortableversion: '02.01.02'
LTM: true
+archived: true
---
## About
diff --git a/_posts/release/2024-07-10-accumulo-2.1.3.md
b/_posts/release/2024-08-12-accumulo-2.1.3.md
similarity index 100%
rename from _posts/release/2024-07-10-accumulo-2.1.3.md
rename to _posts/release/2024-08-12-accumulo-2.1.3.md
diff --git a/pages/downloads.md b/pages/downloads.md
index 30d8eafad..c33cfb2b4 100644
--- a/pages/downloads.md
+++ b/pages/downloads.md
@@ -104,7 +104,7 @@ available in a future update to this site.
-{% assign linkVers = '2.1.2' %}
+{% assign linkVers = '2.1.3' %}
### {{linkVers}} **Latest**{: .badge .bg-primary} **LTM**{: .badge .bg-success}
{: #latest }
(accumulo) branch 2.1.3-rc1 deleted (was 8f52dd10f7)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.1.3-rc1 in repository https://gitbox.apache.org/repos/asf/accumulo.git was 8f52dd10f7 [maven-release-plugin] prepare release rel/2.1.3 The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
(accumulo) branch 2.1.3-rc1-next deleted (was 62b5843701)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.1.3-rc1-next in repository https://gitbox.apache.org/repos/asf/accumulo.git was 62b5843701 [maven-release-plugin] prepare for next development iteration The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
svn commit: r70822 - in /release/accumulo/2.1.3: ./ accumulo-2.1.3-bin.tar.gz accumulo-2.1.3-bin.tar.gz.asc accumulo-2.1.3-bin.tar.gz.sha512 accumulo-2.1.3-src.tar.gz accumulo-2.1.3-src.tar.gz.asc acc
Author: ctubbsii Date: Mon Aug 12 23:25:45 2024 New Revision: 70822 Log: Release Apache Accumulo 2.1.3 artifacts Added: release/accumulo/2.1.3/ release/accumulo/2.1.3/accumulo-2.1.3-bin.tar.gz release/accumulo/2.1.3/accumulo-2.1.3-bin.tar.gz.asc release/accumulo/2.1.3/accumulo-2.1.3-bin.tar.gz.sha512 release/accumulo/2.1.3/accumulo-2.1.3-src.tar.gz release/accumulo/2.1.3/accumulo-2.1.3-src.tar.gz.asc release/accumulo/2.1.3/accumulo-2.1.3-src.tar.gz.sha512 Added: release/accumulo/2.1.3/accumulo-2.1.3-bin.tar.gz == Binary files release/accumulo/2.1.3/accumulo-2.1.3-bin.tar.gz (added) and release/accumulo/2.1.3/accumulo-2.1.3-bin.tar.gz Mon Aug 12 23:25:45 2024 differ Added: release/accumulo/2.1.3/accumulo-2.1.3-bin.tar.gz.asc == --- release/accumulo/2.1.3/accumulo-2.1.3-bin.tar.gz.asc (added) +++ release/accumulo/2.1.3/accumulo-2.1.3-bin.tar.gz.asc Mon Aug 12 23:25:45 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEjMT4orKcKwQPK4Ndbwza5wC2iZ0FAmanMYkACgkQbwza5wC2 +iZ1JRRAAmW6lsrd9FPIf8zzpc2CFz0wZogzX+G82ATNq4b47yi8PPLmf0/xeiTML +updB9HLze6j4gLhaEeyq+TBm0nT8GRi/+nXOET2i1UNLIZ/3ArC9oYVz8al7hCdR +2SkUHW0/dCHK7CCEnWBLUPoi4bdGgJ4k4w7MYK0/+4O1gYqgMVmuMXG8aySV1plM +/Azw4E0zLEogHuoWqjZV0tz0lgTA4OMFZFjN7Tq1QFGlufG8rRRpaKfhz/kzooKA +kewBOPhnhryN0ya1UOV4xDxH91RWlHQzdfahSbdocZikU7in7FMX77NsSba8FYWk +PK1CMeuRc0aBbWZAVmvkG1f2UQHMNeB7k1KfF9MuJFlM3LpiMpZ5EpJ9/SDhSyHV +C5lF4tGhDGPsoo1l3EVSM/x2Lb6Fb3DS7rO7Mg2KaLIHCNjEedyc+PmO/HGZhGFw +455gpwsjlMg2f3raucXcEyeJZko05JS/+iwjUI7IVkw2xjsdoFbXOgf2pFq3BW80 +1hnLfOh+c9CKZx+ptW3F1cJ6dUi2tl+dEpQzevWHWweyE7wjQa3x5sONdSBlfho0 +wWexzNx9CR//Pgj/62fBi4R39MmFaE9KnD57n8ZzAqiFRZkUjgfAnpYAYnT1qpGQ +FseMqT1GiqUs0Z4M0ptPuS5nizSVH85fyae1SQOZabyA2y8Rk1I= +=qyqb +-END PGP SIGNATURE- Added: release/accumulo/2.1.3/accumulo-2.1.3-bin.tar.gz.sha512 == --- release/accumulo/2.1.3/accumulo-2.1.3-bin.tar.gz.sha512 (added) +++ release/accumulo/2.1.3/accumulo-2.1.3-bin.tar.gz.sha512 Mon Aug 12 23:25:45 2024 @@ -0,0 +1 @@ +SHA512 (accumulo-2.1.3-bin.tar.gz) = 1a27a144dc31f55ccc8e081b6c1bc6cc0362a8391838c53c166cb45291ff8f35867fd8e4729aa7b2c540f8b721f8c6953281bf589fc7fe320e4dc4d20b87abc4 Added: release/accumulo/2.1.3/accumulo-2.1.3-src.tar.gz == Binary files release/accumulo/2.1.3/accumulo-2.1.3-src.tar.gz (added) and release/accumulo/2.1.3/accumulo-2.1.3-src.tar.gz Mon Aug 12 23:25:45 2024 differ Added: release/accumulo/2.1.3/accumulo-2.1.3-src.tar.gz.asc == --- release/accumulo/2.1.3/accumulo-2.1.3-src.tar.gz.asc (added) +++ release/accumulo/2.1.3/accumulo-2.1.3-src.tar.gz.asc Mon Aug 12 23:25:45 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEjMT4orKcKwQPK4Ndbwza5wC2iZ0FAmanMYkACgkQbwza5wC2 +iZ3GtA/9FRsfifwe7iNiRhsquqfOuaqDGBfPAPAUYDl5qHc3KnTW+y8lQukh5W7m +3AotalWppdC56VlM0PaevAc5eIjabelKJOc9/Xwi7qQvU2b3dvagZTxsyeufT9fJ +uDRNbC67df4PrX5dYpOs0EEQ4iqSfq0FHd2JLJgbhAXKMrmE+ApDIKUCQRa6KIIJ +QzxvMZ4hRTZTcKgUSeYCIE/EMXkK1sm9mhlXsC1ydyXYFWVyjTQPLwubVE9WqZG5 +zB64ou+GkrceAq4W2nor5DPH8N3ju2OC/ChFF3bkOgLmWVRobLLfIEERAkToVzFz ++ywDW24W8osjerBtVZI0515bP2konp3btFlR3M0LqB3GipWfTf4WVIpy7e8eF5Vr +/2ZQpdcWm788nbwXdK8yb7Z/2FYqFf5NN8XAazhKHoHcfU83saBwy5AB71n10Mhx +yVCHucHWf4xipyC79kkvHRMRZmP2QHjEjvGl4pKu97P18ItAyY8Ymcl8krcUCqTG +EsBbHc0JXTbUbRI/yR3bdxLxeYGyhs79cuBcUeMCmIY7sMJ+PoZEVZfqlXmBsxOQ +T8KKA8o88PxNQ3IDjHS3Y1em2oMNVo/teuagbBX9DrFJpfs3QFHW4drUDQ1rmh41 +wlxp3OdbOuWvSQQpgptl5y8GUKmZ8nszBPcKavR0J1/3jiGLXtM= +=Lab5 +-END PGP SIGNATURE- Added: release/accumulo/2.1.3/accumulo-2.1.3-src.tar.gz.sha512 == --- release/accumulo/2.1.3/accumulo-2.1.3-src.tar.gz.sha512 (added) +++ release/accumulo/2.1.3/accumulo-2.1.3-src.tar.gz.sha512 Mon Aug 12 23:25:45 2024 @@ -0,0 +1 @@ +SHA512 (accumulo-2.1.3-src.tar.gz) = d29d61200204501e2593ee6435200847e153e8444cf3d44431575ab257098750b11ad0d99fd3a24f3597a5962d20581697fa32ffc8a84336516e00b8c4400d92
(accumulo) 02/02: Merge branch '2.1.3-rc1-next' into 2.1
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 29eeed3092e388f866d9ec91f76ca32e98819ef8 Merge: 4ef6cf2fbf 62b5843701 Author: Christopher Tubbs AuthorDate: Mon Aug 12 19:13:28 2024 -0400 Merge branch '2.1.3-rc1-next' into 2.1 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 | 4 ++-- 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, 19 insertions(+), 19 deletions(-)
(accumulo) 01/02: Update post-vote release checklist template
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 4ef6cf2fbf3db2dd1c14c0c402864b98c5de6a6d Author: Christopher Tubbs AuthorDate: Mon Aug 12 19:12:21 2024 -0400 Update post-vote release checklist template Switch checklist items from using GitHub projects to milestones --- .github/ISSUE_TEMPLATE/post_vote_checklist.md | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/post_vote_checklist.md b/.github/ISSUE_TEMPLATE/post_vote_checklist.md index ef03033a5c..6d2cc92b5b 100644 --- a/.github/ISSUE_TEMPLATE/post_vote_checklist.md +++ b/.github/ISSUE_TEMPLATE/post_vote_checklist.md @@ -7,7 +7,10 @@ assignees: '' --- -- [ ] Label this issue with the [project](https://github.com/apache/accumulo/projects) that corresponds to this release version +- [Milestone](https://github.com/apache/accumulo/milestones) tasks + - [ ] Label this issue with the corresponding release milestone + - [ ] Create a milestone for the next version (if necessary) and move any open issues not completed in this release (except this issue) to the new milestone + - [ ] Close the milestone for this issue (the only issue remaining open should be this one) - [Git](https://github.com/apache/accumulo) tasks - [ ] Create a signed `rel/` tag (and push it) - [ ] Merge `-rc-next` branch into a maintenance branch (if maintenance is expected), @@ -42,6 +45,4 @@ assignees: '' - [ ] Send to annou...@apache.org and u...@accumulo.apache.org (use plain text mode only; html email will be rejected) - GitHub wrap-up - [ ] Close this issue - - [ ] Create a new "Automated Kanban" [project](https://github.com/apache/accumulo/projects) for the next version (if necessary) and move any open issues not completed in this release to that project - - [ ] Close the project that corresponds to this release
(accumulo) 01/02: Merge branch '2.1'
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 86358bf984ebffd2c24d18881bf0bb14382c472c Merge: 7f12cc2f70 29eeed3092 Author: Christopher Tubbs AuthorDate: Mon Aug 12 19:16:14 2024 -0400 Merge branch '2.1' .github/ISSUE_TEMPLATE/post_vote_checklist.md | 7 --- pom.xml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
(accumulo) annotated tag rel/2.1.3 created (now 9751b0bc2d)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to annotated tag rel/2.1.3 in repository https://gitbox.apache.org/repos/asf/accumulo.git at 9751b0bc2d (tag) tagging 8f52dd10f7cbfef192c9cc431543619b7072139a (commit) replaces rel/2.1.2 by Christopher Tubbs on Mon Aug 12 19:12:44 2024 -0400 - Log - Apache Accumulo 2.1.3 -BEGIN PGP SIGNATURE- iQIzBAABCgAdFiEEjMT4orKcKwQPK4Ndbwza5wC2iZ0FAma6luwACgkQbwza5wC2 iZ0jMRAAxV9/+Mz84w7Mb7OQhc6/7n7hywtFq4wFxk6vSTPiWfWPrfJal+piDMfl deBedCzNrCZrrWthqOEdgLhtxypEsCW2Dc0sio8ArV6rlAkYaaD//GWhrUMBXps1 3osW2K2bLHdp56aiPm7d31IBR0/hk9roxbXsZci5xi6U0l1y+F78Ee7qsThNpyZA rF9EEnrvLLCUC0klwB5tfe8KfGojQQV/vKTeW7ChrVbwziO78k7x9omup99TWcjG 5/Fx85zSjFRMuzaST/VYWVopMGTL7Ag/nYvtCRGL6MCsI0RM/476h6LvINSEUU5z LAGz88mmQnj2dkAyM0zE9B+dOr065ML/qcH4QQ8+0LzmL6l0yIdyeR/Q0pnf5dcU yhMzQRvdYK3ki6rf2t8bJkgGz0FNBTCwweU/lc+r4humrtcdNWSl3WZdXTuFGS4P ZCpnixqft1vAG6K1gyvDzCRRlNJabs4i1+Cr3S5oHkRpAd4q5GCxKxibQAmhERH/ Q06RKvLDDKPlsoYTO1+y3BwaHnx9PbFJ9IEVDAtq1WGqP1mxUHQYsM2qLO9QbJfB zQ9LdsrPxQ6cb4cabVl1Xe+B2D3zYEidjaAi1skK4wQNmqcoDKeXM32HdqaxUWxv Tc1lI8l96heIPMzYfXv2Z6Xos0+kA8Ihq++eMryreqZDjplUaKo= =VFsu -END PGP SIGNATURE- --- No new revisions were added by this update.
(accumulo) branch elasticity updated (d2eb723fe6 -> 8e97cf616e)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from d2eb723fe6 Merge branch 'main' into elasticity new 4ef6cf2fbf Update post-vote release checklist template add 8f52dd10f7 [maven-release-plugin] prepare release rel/2.1.3 add 62b5843701 [maven-release-plugin] prepare for next development iteration new 29eeed3092 Merge branch '2.1.3-rc1-next' into 2.1 new 86358bf984 Merge branch '2.1' new 8e97cf616e Merge branch 'main' into elasticity The 4 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 | 7 --- pom.xml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
(accumulo) branch 2.1 updated (84de006a14 -> 29eeed3092)
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 84de006a14 Call CheckCompactionConfig during upgrade (#4802) new 4ef6cf2fbf Update post-vote release checklist template add 8f52dd10f7 [maven-release-plugin] prepare release rel/2.1.3 add 62b5843701 [maven-release-plugin] prepare for next development iteration new 29eeed3092 Merge branch '2.1.3-rc1-next' into 2.1 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. Summary of changes: .github/ISSUE_TEMPLATE/post_vote_checklist.md | 7 --- 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 | 4 ++-- 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 +- 19 files changed, 23 insertions(+), 22 deletions(-)
(accumulo) 02/02: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 8e97cf616e3692b772f065f6e9c79a111d5613ee Merge: d2eb723fe6 86358bf984 Author: Christopher Tubbs AuthorDate: Mon Aug 12 19:17:17 2024 -0400 Merge branch 'main' into elasticity .github/ISSUE_TEMPLATE/post_vote_checklist.md | 7 --- pom.xml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
(accumulo) branch main updated (7f12cc2f70 -> 86358bf984)
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 7f12cc2f70 Merge branch '2.1' new 4ef6cf2fbf Update post-vote release checklist template add 8f52dd10f7 [maven-release-plugin] prepare release rel/2.1.3 add 62b5843701 [maven-release-plugin] prepare for next development iteration new 29eeed3092 Merge branch '2.1.3-rc1-next' into 2.1 new 86358bf984 Merge branch '2.1' The 3 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 | 7 --- pom.xml | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-)
(accumulo-website) branch main updated: Add accumulo-access and accumulo-classloaders to Repositories table (#439)
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 75c2bc88b Add accumulo-access and accumulo-classloaders to Repositories table (#439) 75c2bc88b is described below commit 75c2bc88bf15c4b9da20fc6d6215c91e6b7f3507 Author: Dom G. AuthorDate: Wed Aug 7 19:22:17 2024 -0400 Add accumulo-access and accumulo-classloaders to Repositories table (#439) --- pages/how-to-contribute.md | 6 ++ 1 file changed, 6 insertions(+) diff --git a/pages/how-to-contribute.md b/pages/how-to-contribute.md index 547d2c1d4..84e8373f3 100644 --- a/pages/how-to-contribute.md +++ b/pages/how-to-contribute.md @@ -30,6 +30,8 @@ Any questions/ideas don't hesitate to [contact us][contact]. | [Wikisearch][s]| [Contribute][sc] [Issues][si] | Example application that indexes and queries Wikipedia data | | [Proxy][p] | [Issues][pi] | Apache Thrift service that exposes Accumulo to other languages | | [Maven plugin][m] | [Issues][mi] | Maven plugin that runs Accumulo | +| [Classloaders][c] | [Issues][ci] | Apache Accumulo Classloader Extras | +| [Access][aa] | [Issues][aai] | Apache Accumulo Access Control Library | ## Example Contribution workflow @@ -93,6 +95,10 @@ For more information, see the [contributor guide](/contributors-guide/). [pi]: https://github.com/apache/accumulo-proxy/issues [m]: https://github.com/apache/accumulo-maven-plugin [mi]: https://github.com/apache/accumulo-maven-plugin/issues +[c]: https://github.com/apache/accumulo-classloaders +[ci]: https://github.com/apache/accumulo-classloaders/issues +[aa]: https://github.com/apache/accumulo-access +[aai]: https://github.com/apache/accumulo-access/issues [github-join]: https://github.com/join [GitHub]: https://github.com/apache/accumulo/pulls [Jenkins]: https://builds.apache.org/view/A/view/Accumulo
(accumulo-testing) branch main updated: Removed TSERV_WORKQ_THREADS property usage (#281)
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-testing.git
The following commit(s) were added to refs/heads/main by this push:
new 813d336 Removed TSERV_WORKQ_THREADS property usage (#281)
813d336 is described below
commit 813d336dbf8391576fbd821fd3d9986e5cfe3289
Author: Dave Marion
AuthorDate: Wed Aug 7 04:00:31 2024 -0400
Removed TSERV_WORKQ_THREADS property usage (#281)
Remove the property usage because it was removed in apache/accumulo#4747
This fixes #280
---
.../org/apache/accumulo/testing/randomwalk/concurrent/Config.java | 4
1 file changed, 4 deletions(-)
diff --git
a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
index 6253353..fdf5c30 100644
---
a/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
+++
b/src/main/java/org/apache/accumulo/testing/randomwalk/concurrent/Config.java
@@ -65,9 +65,6 @@ public class Config extends Test {
final Property TSERV_COMPACTION_SERVICE_DEFAULT_EXECUTORS_deprecated =
Property.TSERV_COMPACTION_SERVICE_DEFAULT_EXECUTORS;
- @SuppressWarnings("deprecation")
- final Property TSERV_WORKQ_THREADS_deprecated = Property.TSERV_WORKQ_THREADS;
-
@SuppressWarnings("deprecation")
final Property TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN_deprecated =
Property.TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN;
@@ -96,7 +93,6 @@ public class Config extends Test {
s(Property.TSERV_WAL_SORT_BUFFER_SIZE, 1024 * 1024,
1024 * 1024 * 1024L),
s(TSERV_TABLET_SPLIT_FINDMIDPOINT_MAXOPEN_deprecated,
5, 100),
s(Property.TSERV_WAL_BLOCKSIZE, 1024 * 1024,1024 * 1024
* 1024 * 10L),
- s(TSERV_WORKQ_THREADS_deprecated, 1, 10),
s(Property.MANAGER_BULK_TIMEOUT, 10, 600),
s(Property.MANAGER_FATE_THREADPOOL_SIZE, 1, 100),
s(Property.MANAGER_RECOVERY_DELAY, 0, 100),
(accumulo-website) branch main updated: Bump rexml from 3.3.2 to 3.3.3 (#437)
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 ee65df0a3 Bump rexml from 3.3.2 to 3.3.3 (#437) ee65df0a3 is described below commit ee65df0a33071670a0b58b2845b39f2c43ac4922 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> AuthorDate: Wed Aug 7 03:48:12 2024 -0400 Bump rexml from 3.3.2 to 3.3.3 (#437) Bumps [rexml](https://github.com/ruby/rexml) from 3.3.2 to 3.3.3. - [Release notes](https://github.com/ruby/rexml/releases) - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md) - [Commits](https://github.com/ruby/rexml/compare/v3.3.2...v3.3.3) --- updated-dependencies: - dependency-name: rexml dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- Gemfile.lock | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Gemfile.lock b/Gemfile.lock index 0336da1a4..8b40c8c78 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -52,7 +52,7 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) -rexml (3.3.2) +rexml (3.3.3) strscan rouge (4.3.0) safe_yaml (1.0.5)
(accumulo) 01/01: [maven-release-plugin] prepare release rel/2.1.3
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1.3-rc1 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 8f52dd10f7cbfef192c9cc431543619b7072139a Author: Christopher Tubbs AuthorDate: Mon Jul 29 02:03:16 2024 -0400 [maven-release-plugin] prepare release rel/2.1.3 --- 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 d24a608120..236588b5da 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 accumulo pom diff --git a/core/pom.xml b/core/pom.xml index 9822afe1b8..74d4cc434a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 accumulo-core Apache Accumulo Core diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml index a56abf9073..2989ff2b46 100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 accumulo-hadoop-mapreduce Apache Accumulo Hadoop MapReduce diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml index 11fbcb26a4..a3531e6416 100644 --- a/iterator-test-harness/pom.xml +++ b/iterator-test-harness/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 accumulo-iterator-test-harness Apache Accumulo Iterator Test Harness diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 7a013b402c..200f534644 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 accumulo-minicluster Apache Accumulo MiniCluster diff --git a/pom.xml b/pom.xml index 16de14b163..8f49719731 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.accumulo accumulo-project - 2.1.3-SNAPSHOT + 2.1.3 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.3 https://gitbox.apache.org/repos/asf?p=accumulo.git @@ -136,7 +136,7 @@ .+-SNAPSHOT,(?i).*(alpha|beta)[0-9.-]*,(?i).*[.-](m|rc)[0-9]+ 17 - 2023-08-14T08:01:47Z + 2024-07-29T06:01:36Z true source-release-tar diff --git a/server/base/pom.xml b/server/base/pom.xml index 13984282d5..a203733e5a 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 ../../pom.xml accumulo-server-base diff --git a/server/compaction-coordinator/pom.xml b/server/compaction-coordinator/pom.xml index 497a733b8b..3d8735bc5b 100644 --- a/server/compaction-coordinator/pom.xml +++ b/server/compaction-coordinator/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 ../../pom.xml accumulo-compaction-coordinator diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml index 1866909c92..4da650de60 100644 --- a/server/compactor/pom.xml +++ b/server/compactor/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 ../../pom.xml accumulo-compactor diff --git a/server/gc/pom.xml b/server/gc/pom.xml index 1c2d9b9cba..1b4ef984f0 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 ../../pom.xml accumulo-gc diff --git a/server/manager/pom.xml b/server/manager/pom.xml index 920509a740..29d605b7d2 100644 --- a/server/manager/pom.xml +++ b/server/manager/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 ../../pom.xml
(accumulo) branch 2.1.3-rc1-next created (now 62b5843701)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.1.3-rc1-next in repository https://gitbox.apache.org/repos/asf/accumulo.git at 62b5843701 [maven-release-plugin] prepare for next development iteration This branch includes the following new commits: new 8f52dd10f7 [maven-release-plugin] prepare release rel/2.1.3 new 62b5843701 [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.3-rc1-next in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 62b5843701a77f5d3878eb4782dfeae83e8d26aa Author: Christopher Tubbs AuthorDate: Mon Jul 29 02:03:16 2024 -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 236588b5da..2d933e582f 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT accumulo pom diff --git a/core/pom.xml b/core/pom.xml index 74d4cc434a..327a02ea42 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT accumulo-core Apache Accumulo Core diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml index 2989ff2b46..bca66f8f62 100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT accumulo-hadoop-mapreduce Apache Accumulo Hadoop MapReduce diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml index a3531e6416..f5ad91ebe0 100644 --- a/iterator-test-harness/pom.xml +++ b/iterator-test-harness/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT accumulo-iterator-test-harness Apache Accumulo Iterator Test Harness diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 200f534644..4a304429b0 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT accumulo-minicluster Apache Accumulo MiniCluster diff --git a/pom.xml b/pom.xml index 8f49719731..1faae07633 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.accumulo accumulo-project - 2.1.3 + 2.1.4-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.3 +HEAD https://gitbox.apache.org/repos/asf?p=accumulo.git @@ -136,7 +136,7 @@ .+-SNAPSHOT,(?i).*(alpha|beta)[0-9.-]*,(?i).*[.-](m|rc)[0-9]+ 17 - 2024-07-29T06:01:36Z + 2024-07-29T06:03:16Z true source-release-tar diff --git a/server/base/pom.xml b/server/base/pom.xml index a203733e5a..882b3634d8 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT ../../pom.xml accumulo-server-base diff --git a/server/compaction-coordinator/pom.xml b/server/compaction-coordinator/pom.xml index 3d8735bc5b..18c8699af1 100644 --- a/server/compaction-coordinator/pom.xml +++ b/server/compaction-coordinator/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT ../../pom.xml accumulo-compaction-coordinator diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml index 4da650de60..dc81eb351c 100644 --- a/server/compactor/pom.xml +++ b/server/compactor/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT ../../pom.xml accumulo-compactor diff --git a/server/gc/pom.xml b/server/gc/pom.xml index 1b4ef984f0..00a091dab0 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT ../../pom.xml accumulo-gc diff --git a/server/manager/pom.xml b/server/manager/pom.xml index 29d605b7d2..20da2677cc 100644 --- a/server/manager/pom.xml +++ b/server/manager/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT
(accumulo) branch 2.1.3-rc1 created (now 8f52dd10f7)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.1.3-rc1 in repository https://gitbox.apache.org/repos/asf/accumulo.git at 8f52dd10f7 [maven-release-plugin] prepare release rel/2.1.3 This branch includes the following new commits: new 8f52dd10f7 [maven-release-plugin] prepare release rel/2.1.3 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 elasticity updated (8f92187c59 -> 0ce1960d7a)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from 8f92187c59 Merge branch 'main' into elasticity add bdb8ce9725 Add fine-grained options to GrepIterator add a6e1fd2ce6 Merge branch '2.1' new 0ce1960d7a Merge branch 'main' into elasticity 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: .../accumulo/core/iterators/user/GrepIterator.java | 80 -- .../core/iterators/user/GrepIteratorTest.java | 1 + .../accumulo/shell/commands/GrepCommand.java | 6 +- 3 files changed, 79 insertions(+), 8 deletions(-)
(accumulo) 01/01: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 0ce1960d7a584b1d202c9f77d5af750a03bd1b44 Merge: 8f92187c59 a6e1fd2ce6 Author: Christopher Tubbs AuthorDate: Mon Jul 29 01:22:11 2024 -0400 Merge branch 'main' into elasticity .../accumulo/core/iterators/user/GrepIterator.java | 80 -- .../core/iterators/user/GrepIteratorTest.java | 1 + .../accumulo/shell/commands/GrepCommand.java | 6 +- 3 files changed, 79 insertions(+), 8 deletions(-)
(accumulo) branch main updated (63dd6503ad -> a6e1fd2ce6)
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 63dd6503ad Merge branch '2.1' add bdb8ce9725 Add fine-grained options to GrepIterator add a6e1fd2ce6 Merge branch '2.1' No new revisions were added by this update. Summary of changes: .../accumulo/core/iterators/user/GrepIterator.java | 80 -- .../core/iterators/user/GrepIteratorTest.java | 1 + .../accumulo/shell/commands/GrepCommand.java | 6 +- 3 files changed, 79 insertions(+), 8 deletions(-)
(accumulo) branch 2.1 updated: Add fine-grained options to GrepIterator
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 bdb8ce9725 Add fine-grained options to GrepIterator
bdb8ce9725 is described below
commit bdb8ce9725e007435db55b438f577065fafb1151
Author: Christopher Tubbs
AuthorDate: Mon Jul 29 01:14:17 2024 -0400
Add fine-grained options to GrepIterator
Update the previously merged feature to match on column visibilities
using the GrepIterator, which was added in PR #4468
Now, GrepIterator supports a number of fine-grained options to choose
exactly which fields to match on. It preserves the behavior prior to the
changes in PR #4468 by default for the GrepIterator, but retains the
change to the GrepCommand for the shell by enabling the new option to
match on column visibilities.
---
.../accumulo/core/iterators/user/GrepIterator.java | 80 --
.../core/iterators/user/GrepIteratorTest.java | 1 +
.../accumulo/shell/commands/GrepCommand.java | 6 +-
3 files changed, 79 insertions(+), 8 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
b/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
index 9e3fa110c8..ed327f70d1 100644
---
a/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
+++
b/core/src/main/java/org/apache/accumulo/core/iterators/user/GrepIterator.java
@@ -33,18 +33,45 @@ import
org.apache.accumulo.core.iterators.IteratorEnvironment;
import org.apache.accumulo.core.iterators.SortedKeyValueIterator;
/**
- * This iterator provides exact string matching. It searches both the Key and
Value for the string.
- * The string to match is specified by the "term" option.
+ * This iterator provides exact string matching of the term specified by the
"term" option. It
+ * searches both the Key and Value for the string, according to the specified
configuration options.
+ *
+ *
+ * The match options are:
+ *
+ * term (String, required)
+ * matchRow (boolean, default: true)
+ * matchColumnFamily (boolean, default: true)
+ * matchColumnQualifier (boolean, default: true)
+ * matchColumnVisibility (boolean, default: false)
+ * matchValue (boolean, default: true)
+ *
*/
public class GrepIterator extends Filter {
+ private static final String TERM_OPT = "term";
+
+ private static final String MATCH_ROW_OPT = "matchRow";
+ private static final String MATCH_COLFAM_OPT = "matchColumnFamily";
+ private static final String MATCH_COLQUAL_OPT = "matchColumnQualifier";
+ private static final String MATCH_COLVIS_OPT = "matchColumnVisibility";
+ private static final String MATCH_VALUE_OPT = "matchValue";
+
private byte[] term;
private int[] right = new int[256];
+ private boolean matchRow = true;
+ private boolean matchColFam = true;
+ private boolean matchColQual = true;
+ private boolean matchColVis = false;
+ private boolean matchValue = true;
+
@Override
public boolean accept(Key k, Value v) {
-return match(v.get()) || match(k.getRowData()) ||
match(k.getColumnFamilyData())
-|| match(k.getColumnQualifierData()) ||
match(k.getColumnVisibilityData());
+return (matchValue && match(v.get())) || (matchRow &&
match(k.getRowData()))
+|| (matchColFam && match(k.getColumnFamilyData()))
+|| (matchColQual && match(k.getColumnQualifierData()))
+|| (matchColVis && match(k.getColumnVisibilityData()));
}
protected boolean match(ByteSequence bs) {
@@ -77,6 +104,11 @@ public class GrepIterator extends Filter {
public SortedKeyValueIterator deepCopy(IteratorEnvironment env) {
GrepIterator copy = (GrepIterator) super.deepCopy(env);
copy.term = Arrays.copyOf(term, term.length);
+copy.matchRow = matchRow;
+copy.matchColFam = matchColFam;
+copy.matchColQual = matchColQual;
+copy.matchColVis = matchColVis;
+copy.matchValue = matchValue;
return copy;
}
@@ -84,19 +116,55 @@ public class GrepIterator extends Filter {
public void init(SortedKeyValueIterator source,
Map options,
IteratorEnvironment env) throws IOException {
super.init(source, options, env);
-term = options.get("term").getBytes(UTF_8);
+term = options.get(TERM_OPT).getBytes(UTF_8);
for (int i = 0; i < right.length; i++) {
right[i] = -1;
}
for (int i = 0; i < term.length; i++) {
right[term[i] & 0xff] = i;
}
+String matchItem = null;
+if ((matchItem = options.get(MATCH_ROW_OPT)) != null) {
+ matchRow = Boolean.parseBoolean(matchItem);
+}
+if ((matchItem = options.get(MATCH_COLFAM_OPT)) != null) {
+ matchColFam = Boolean
(accumulo) branch elasticity updated (f106e10153 -> 8f92187c59)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from f106e10153 Merge branch 'main' into elasticity add fffed51104 Verify upgrade is complete before starting fate (#3717) add 63dd6503ad Merge branch '2.1' new 8f92187c59 Merge branch 'main' into elasticity 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: .../java/org/apache/accumulo/manager/Manager.java | 84 ++ 1 file changed, 39 insertions(+), 45 deletions(-)
(accumulo) branch main updated (95a6ca23ad -> 63dd6503ad)
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 95a6ca23ad Merge branch '2.1' add fffed51104 Verify upgrade is complete before starting fate (#3717) add 63dd6503ad Merge branch '2.1' No new revisions were added by this update. Summary of changes: .../java/org/apache/accumulo/manager/Manager.java | 84 ++ 1 file changed, 39 insertions(+), 45 deletions(-)
(accumulo) 01/01: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 8f92187c59c1d5e269d443882a8d49d4868a8bf6
Merge: f106e10153 63dd6503ad
Author: Christopher Tubbs
AuthorDate: Sun Jul 28 22:24:43 2024 -0400
Merge branch 'main' into elasticity
.../java/org/apache/accumulo/manager/Manager.java | 84 ++
1 file changed, 39 insertions(+), 45 deletions(-)
diff --cc server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index 260f1823f5,968e5c1c98..0690e93afa
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@@ -50,8 -50,6 +50,7 @@@ import java.util.concurrent.CountDownLa
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
- import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
@@@ -235,16 -223,11 +234,15 @@@ public class Manager extends AbstractSe
final ServerBulkImportStatus bulkImportStatus = new
ServerBulkImportStatus();
private final AtomicBoolean managerInitialized = new AtomicBoolean(false);
- private final AtomicBoolean managerUpgrading = new AtomicBoolean(false);
- private final long timeToCacheRecoveryWalExistence;
+ private final long timeToCacheRecoveryWalExistence;
private ExecutorService tableInformationStatusPool = null;
+ private ThreadPoolExecutor tabletRefreshThreadPool;
+
+ private final TabletStateStore rootTabletStore;
+ private final TabletStateStore metadataTabletStore;
+ private final TabletStateStore userTabletStore;
- @Override
public synchronized ManagerState getManagerState() {
return state;
}
@@@ -1140,18 -1248,11 +1138,12 @@@
throw new IllegalStateException("Exception getting manager lock", e);
}
- // If UpgradeStatus is not at complete by this moment, then things are
currently
- // upgrading.
- if (upgradeCoordinator.getStatus() !=
UpgradeCoordinator.UpgradeStatus.COMPLETE) {
- managerUpgrading.set(true);
- }
-
MetricsInfo metricsInfo = getContext().getMetricsInfo();
-metricsInfo.addServiceTags(getApplicationName(), sa.getAddress());
-
-var producers = ManagerMetrics.getProducers(getConfiguration(), this);
+metricsInfo.addServiceTags(getApplicationName(), sa.getAddress(),
getResourceGroup());
+ManagerMetrics managerMetrics = new ManagerMetrics(getConfiguration(),
this);
+var producers = managerMetrics.getProducers(getConfiguration(), this);
producers.add(balancerMetrics);
+
metricsInfo.addMetricsProducers(producers.toArray(new
MetricsProducer[0]));
metricsInfo.init();
@@@ -1251,18 -1340,22 +1241,22 @@@
throw new IllegalStateException("Metadata upgrade failed", e);
}
+ // Everything should be fully upgraded by this point, but check before
starting fate
+ if (isUpgrading()) {
+ throw new IllegalStateException("Upgrade coordinator is unexpectedly
not complete");
+ }
try {
- final AgeOffStore store = new AgeOffStore<>(
- new org.apache.accumulo.core.fate.ZooStore<>(getZooKeeperRoot() +
Constants.ZFATE,
- context.getZooReaderWriter()),
- HOURS.toMillis(8), System::currentTimeMillis);
-
- Fate f = initializeFateInstance(store, getConfiguration());
- fateRef.set(f);
+ var metaInstance = initializeFateInstance(context,
+ new MetaFateStore<>(getZooKeeperRoot() + Constants.ZFATE,
context.getZooReaderWriter()));
+ var userInstance = initializeFateInstance(context,
+ new UserFateStore<>(context, AccumuloTable.FATE.tableName()));
+
+ if (!fateRefs.compareAndSet(null,
+ Map.of(FateInstanceType.META, metaInstance, FateInstanceType.USER,
userInstance))) {
+throw new IllegalStateException(
+"Unexpected previous fate reference map already initialized");
+ }
fateReadyLatch.countDown();
-
- ThreadPools.watchCriticalScheduledTask(context.getScheduledExecutor()
- .scheduleWithFixedDelay(store::ageOff, 63000, 63000, MILLISECONDS));
} catch (KeeperException | InterruptedException e) {
throw new IllegalStateException("Exception setting up FaTE cleanup
thread", e);
}
(accumulo) branch 2.1 updated: Verify upgrade is complete before starting fate (#3717)
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 fffed51104 Verify upgrade is complete before starting fate (#3717)
fffed51104 is described below
commit fffed511045a3e49635bda30d1cd5153fa345a9a
Author: Christopher Tubbs
AuthorDate: Sun Jul 28 21:08:25 2024 -0400
Verify upgrade is complete before starting fate (#3717)
* Simplify checking upgrade and fate status during state changes by
changing the implementation of `isUpgrading()` to use the
upgradeCoordinator, explicitly checking if upgrades are complete
before starting fate (related to #2990 and fixes #3716), and only
running the upgrade tasks on state changes if the upgrade coordinator
isn't done with upgrades
* Throw an exception if an illegal state change is detected, rather than
merely log an error
* Also fix some code quality issues by removing redundant check for
`oldState != newState`, using a switch statement for newState instead,
and using enum equality check as `==` instead of `.equals()`
This fixes #3716
---
.../java/org/apache/accumulo/manager/Manager.java | 81 ++
1 file changed, 38 insertions(+), 43 deletions(-)
diff --git
a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
index a72485af01..a554b2d818 100644
--- a/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
+++ b/server/manager/src/main/java/org/apache/accumulo/manager/Manager.java
@@ -220,7 +220,6 @@ public class Manager extends AbstractServer
final ServerBulkImportStatus bulkImportStatus = new ServerBulkImportStatus();
private final AtomicBoolean managerInitialized = new AtomicBoolean(false);
- private final AtomicBoolean managerUpgrading = new AtomicBoolean(false);
private final long timeToCacheRecoveryWalExistence;
@Override
@@ -279,38 +278,40 @@ public class Manager extends AbstractServer
/* UNLOAD_ROOT_TABLET */ {O, O, O, X, X, X, X},
/* STOP */{O, O, O, O, O, X, X}};
//@formatter:on
- synchronized void setManagerState(ManagerState newState) {
-if (state.equals(newState)) {
+ synchronized void setManagerState(final ManagerState newState) {
+if (state == newState) {
return;
}
if (!transitionOK[state.ordinal()][newState.ordinal()]) {
- log.error("Programmer error: manager should not transition from {} to
{}", state, newState);
+ throw new IllegalStateException(String.format(
+ "Programmer error: manager should not transition from %s to %s",
state, newState));
}
-ManagerState oldState = state;
+final ManagerState oldState = state;
state = newState;
nextEvent.event("State changed from %s to %s", oldState, newState);
-if (newState == ManagerState.STOP) {
- // Give the server a little time before shutdown so the client
- // thread requesting the stop can return
- ScheduledFuture future =
getContext().getScheduledExecutor().scheduleWithFixedDelay(() -> {
-// This frees the main thread and will cause the manager to exit
-clientService.stop();
-Manager.this.nextEvent.event("stopped event loop");
- }, 100L, 1000L, MILLISECONDS);
- ThreadPools.watchNonCriticalScheduledTask(future);
-}
-
-if (oldState != newState && (newState == ManagerState.HAVE_LOCK)) {
- upgradeCoordinator.upgradeZookeeper(getContext(), nextEvent);
-}
-
-if (oldState != newState && (newState == ManagerState.NORMAL)) {
- if (fateRef.get() != null) {
-throw new IllegalStateException("Access to Fate should not have been"
-+ " initialized prior to the Manager finishing upgrades. Please
save"
-+ " all logs and file a bug.");
- }
- upgradeMetadataFuture = upgradeCoordinator.upgradeMetadata(getContext(),
nextEvent);
+switch (newState) {
+ case STOP:
+// Give the server a little time before shutdown so the client
+// thread requesting the stop can return
+final var future =
getContext().getScheduledExecutor().scheduleWithFixedDelay(() -> {
+ // This frees the main thread and will cause the manager to exit
+ clientService.stop();
+ Manager.this.nextEvent.event("stopped event loop");
+}, 100L, 1000L, MILLISECONDS);
+ThreadPools.watchNonCriticalScheduledTask(future);
+break;
+ case HAVE_LOCK:
+if (isUpgrading()) {
+ upgradeCoordinator.upgradeZookeeper(getContext(), nextEvent);
+}
+break;
+ case NORMAL:
+if (isUp
(accumulo) 01/01: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 24ead4b4bdf97a73db6d09799273d5eafc2444a5 Merge: 684c514469 00da7799ae Author: Christopher Tubbs AuthorDate: Sun Jul 28 15:24:02 2024 -0400 Merge branch 'main' into elasticity .../accumulo/core/data/ArrayByteSequence.java | 20 ++ .../org/apache/accumulo/core/file/rfile/RFile.java | 7 +- .../accumulo/core/file/rfile/RelativeKey.java | 84 +++--- .../accumulo/core/util/LocalityGroupUtil.java | 6 +- .../accumulo/core/util/MutableByteSequence.java| 47 .../accumulo/core/data/ArrayByteSequenceTest.java | 18 ++--- .../accumulo/core/file/rfile/RelativeKeyTest.java | 9 ++- 7 files changed, 66 insertions(+), 125 deletions(-)
(accumulo) branch elasticity updated (684c514469 -> 24ead4b4bd)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from 684c514469 tests user compaction requested using FlakyAmple (#4772) add 00da7799ae Collapse MutableByteSequence into ArrayByteSequence (#4745) new 24ead4b4bd Merge branch 'main' into elasticity 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: .../accumulo/core/data/ArrayByteSequence.java | 20 ++ .../org/apache/accumulo/core/file/rfile/RFile.java | 7 +- .../accumulo/core/file/rfile/RelativeKey.java | 84 +++--- .../accumulo/core/util/LocalityGroupUtil.java | 6 +- .../accumulo/core/util/MutableByteSequence.java| 47 .../accumulo/core/data/ArrayByteSequenceTest.java | 18 ++--- .../accumulo/core/file/rfile/RelativeKeyTest.java | 9 ++- 7 files changed, 66 insertions(+), 125 deletions(-) delete mode 100644 core/src/main/java/org/apache/accumulo/core/util/MutableByteSequence.java
(accumulo) branch main updated: Collapse MutableByteSequence into ArrayByteSequence (#4745)
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
The following commit(s) were added to refs/heads/main by this push:
new 00da7799ae Collapse MutableByteSequence into ArrayByteSequence (#4745)
00da7799ae is described below
commit 00da7799ae0ec2d27a5312e7c2646e38a6112ba7
Author: John K <69256191+meatballspaghe...@users.noreply.github.com>
AuthorDate: Sun Jul 28 12:59:47 2024 -0400
Collapse MutableByteSequence into ArrayByteSequence (#4745)
* Delete MutableByteSequence
* Replace uses with ArrayByteSequence
* Add bound checks to array modification methods from Objects
and update tests accordingly
* Use reset method in more places with final variables
* Simplify RelativeKey readPrefix and read methods using reset
This fixes #4738
---
.../accumulo/core/data/ArrayByteSequence.java | 20 ++
.../org/apache/accumulo/core/file/rfile/RFile.java | 7 +-
.../accumulo/core/file/rfile/RelativeKey.java | 84 +++---
.../accumulo/core/util/LocalityGroupUtil.java | 6 +-
.../accumulo/core/util/MutableByteSequence.java| 47
.../accumulo/core/data/ArrayByteSequenceTest.java | 18 ++---
.../accumulo/core/file/rfile/RelativeKeyTest.java | 9 ++-
7 files changed, 66 insertions(+), 125 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
index 6c57ba7a3e..608804a0f6 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
@@ -23,6 +23,7 @@ import static java.nio.charset.StandardCharsets.UTF_8;
import java.io.Serializable;
import java.nio.ByteBuffer;
import java.util.Arrays;
+import java.util.Objects;
import org.apache.accumulo.core.util.ByteBufferUtil;
@@ -62,10 +63,7 @@ public class ArrayByteSequence extends ByteSequence
implements Serializable {
*/
public ArrayByteSequence(byte[] data, int offset, int length) {
-if (offset < 0 || offset > data.length || length < 0 || (offset + length)
> data.length) {
- throw new IllegalArgumentException(" Bad offset and/or length
data.length = " + data.length
- + " offset = " + offset + " length = " + length);
-}
+Objects.checkFromIndexSize(offset, length, data.length);
this.data = data;
this.offset = offset;
@@ -123,13 +121,7 @@ public class ArrayByteSequence extends ByteSequence
implements Serializable {
@Override
public byte byteAt(int i) {
-if (i < 0) {
- throw new IllegalArgumentException("i < 0, " + i);
-}
-
-if (i >= length) {
- throw new IllegalArgumentException("i >= length, " + i + " >= " +
length);
-}
+Objects.checkIndex(i, length);
return data[offset + i];
}
@@ -160,6 +152,7 @@ public class ArrayByteSequence extends ByteSequence
implements Serializable {
* @since 3.1.0
*/
public void reset(byte[] data, int offset, int length) {
+Objects.checkFromIndexSize(offset, length, data.length);
this.data = data;
this.offset = offset;
this.length = length;
@@ -168,10 +161,7 @@ public class ArrayByteSequence extends ByteSequence
implements Serializable {
@Override
public ByteSequence subSequence(int start, int end) {
-if (start > end || start < 0 || end > length) {
- throw new IllegalArgumentException("Bad start and/end start = " + start
+ " end=" + end
- + " offset=" + offset + " length=" + length);
-}
+Objects.checkFromToIndex(start, end, length);
return new ArrayByteSequence(data, offset + start, end - start);
}
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
index 00d01aad9f..dfa164e9b5 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/RFile.java
@@ -78,7 +78,6 @@ import
org.apache.accumulo.core.iteratorsImpl.system.LocalityGroupIterator.Local
import org.apache.accumulo.core.metadata.TabletFile;
import org.apache.accumulo.core.sample.impl.SamplerConfigurationImpl;
import org.apache.accumulo.core.util.LocalityGroupUtil;
-import org.apache.accumulo.core.util.MutableByteSequence;
import org.apache.commons.lang3.mutable.MutableLong;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.Writable;
@@ -993,7 +992,7 @@ public class RFile {
// causing the build of an index... doing this could slow down some
use cases and
// and speed up others.
- MutableByteSequence valbs =
(accumulo) branch main updated (5dbaec8f78 -> 70621e16b6)
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 5dbaec8f78 Merge branch '2.1' new 8b879c4e7a Bump the copyright year to 2024 new 70621e16b6 Merge branch '2.1' 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. Summary of changes: NOTICE | 2 +- assemble/src/main/resources/NOTICE | 2 +- server/native/src/main/resources/NOTICE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(accumulo) 02/02: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 083590c4e38cc1fb58714e1320ba02281a69504a Merge: 800eecf390 70621e16b6 Author: Christopher Tubbs AuthorDate: Fri Jul 26 11:13:45 2024 -0400 Merge branch 'main' into elasticity NOTICE | 2 +- assemble/src/main/resources/NOTICE | 2 +- server/native/src/main/resources/NOTICE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(accumulo) branch 2.1 updated: Bump the copyright year to 2024
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 8b879c4e7a Bump the copyright year to 2024 8b879c4e7a is described below commit 8b879c4e7ae8583e72448d66d073973a508fb716 Author: Christopher Tubbs AuthorDate: Fri Jul 26 11:11:34 2024 -0400 Bump the copyright year to 2024 --- NOTICE | 2 +- assemble/src/main/resources/NOTICE | 2 +- server/native/src/main/resources/NOTICE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NOTICE b/NOTICE index 2fb17fa5e8..52b32cf2ea 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ Apache Accumulo -Copyright 2011-2023 The Apache Software Foundation +Copyright 2011-2024 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). diff --git a/assemble/src/main/resources/NOTICE b/assemble/src/main/resources/NOTICE index 2642465e77..1ec60645df 100644 --- a/assemble/src/main/resources/NOTICE +++ b/assemble/src/main/resources/NOTICE @@ -1,5 +1,5 @@ Apache Accumulo -Copyright 2011-2023 The Apache Software Foundation +Copyright 2011-2024 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/). diff --git a/server/native/src/main/resources/NOTICE b/server/native/src/main/resources/NOTICE index eaa93c66fb..15b354dbb2 100644 --- a/server/native/src/main/resources/NOTICE +++ b/server/native/src/main/resources/NOTICE @@ -1,5 +1,5 @@ Apache Accumulo Native Libraries -Copyright 2011-2023 The Apache Software Foundation +Copyright 2011-2024 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (https://www.apache.org/).
(accumulo) 01/02: Merge branch '2.1'
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 70621e16b655dd0d97d680ff673f29e534ef3955 Merge: 5dbaec8f78 8b879c4e7a Author: Christopher Tubbs AuthorDate: Fri Jul 26 11:11:49 2024 -0400 Merge branch '2.1' NOTICE | 2 +- assemble/src/main/resources/NOTICE | 2 +- server/native/src/main/resources/NOTICE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(accumulo) branch elasticity updated (800eecf390 -> 083590c4e3)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from 800eecf390 Merge branch 'main' into elasticity new 8b879c4e7a Bump the copyright year to 2024 new 70621e16b6 Merge branch '2.1' new 083590c4e3 Merge branch 'main' into elasticity The 3 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: NOTICE | 2 +- assemble/src/main/resources/NOTICE | 2 +- server/native/src/main/resources/NOTICE | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
(accumulo) branch main updated (3ee04b18b3 -> 5dbaec8f78)
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 3ee04b18b3 Fix ReturnValueIgnored on IdleProcessMetricsIT (#4764) add e16d51b457 Backport IdleProcessMetricsIT from #4764 new 5dbaec8f78 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: .../java/org/apache/accumulo/core/clientImpl/ClientContext.java| 5 + .../java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java | 7 ++- 2 files changed, 3 insertions(+), 9 deletions(-)
(accumulo) 02/02: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 800eecf390f07dee656edc7f9d11ba8a35b17762 Merge: ea48421dbe 5dbaec8f78 Author: Christopher Tubbs AuthorDate: Fri Jul 26 08:00:54 2024 -0400 Merge branch 'main' into elasticity .../java/org/apache/accumulo/core/clientImpl/ClientContext.java| 5 + .../java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java | 7 ++- 2 files changed, 3 insertions(+), 9 deletions(-) diff --cc core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java index bee134896e,2983320c9c..07ff915c95 --- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java +++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java @@@ -24,9 -24,9 +24,8 @@@ import static com.google.common.base.Su import static java.nio.charset.StandardCharsets.UTF_8; import static java.util.concurrent.TimeUnit.MILLISECONDS; import static java.util.concurrent.TimeUnit.SECONDS; -import static org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOCATION; import java.lang.Thread.UncaughtExceptionHandler; - import java.lang.reflect.InvocationTargetException; import java.net.URL; import java.nio.file.Path; import java.util.Collection;
(accumulo) branch elasticity updated (ea48421dbe -> 800eecf390)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from ea48421dbe Merge branch 'main' into elasticity add e16d51b457 Backport IdleProcessMetricsIT from #4764 new 5dbaec8f78 Merge branch '2.1' new 800eecf390 Merge branch 'main' into elasticity 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. Summary of changes: .../java/org/apache/accumulo/core/clientImpl/ClientContext.java| 5 + .../java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java | 7 ++- 2 files changed, 3 insertions(+), 9 deletions(-)
(accumulo) 01/02: Merge branch '2.1'
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 5dbaec8f78c1ca5b4e13fcf53c8f2f1bc3bafc32
Merge: 3ee04b18b3 e16d51b457
Author: Christopher Tubbs
AuthorDate: Fri Jul 26 08:00:20 2024 -0400
Merge branch '2.1'
.../java/org/apache/accumulo/core/clientImpl/ClientContext.java| 5 +
.../java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java | 7 ++-
2 files changed, 3 insertions(+), 9 deletions(-)
diff --cc
server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java
index 3228cecaad,9053567dd5..7aafa1fbea
---
a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java
@@@ -267,16 -264,20 +265,15 @@@ public class MetricsInfoImpl implement
}
}
- // support for org.apache.accumulo.core.metrics.MeterRegistryFactory can be
removed in 3.1
@VisibleForTesting
- @SuppressWarnings("deprecation")
static MeterRegistry getRegistryFromFactory(final String factoryName, final
ServerContext context)
- throws ClassNotFoundException, NoSuchMethodException,
InvocationTargetException,
- InstantiationException, IllegalAccessException {
+ throws ReflectiveOperationException {
try {
LOG.info("look for meter spi registry factory {}", factoryName);
- Class clazz =
- ClassLoaderUtil.loadClass(factoryName,
-
org.apache.accumulo.core.spi.metrics.MeterRegistryFactory.class);
- org.apache.accumulo.core.spi.metrics.MeterRegistryFactory factory =
- clazz.getDeclaredConstructor().newInstance();
-
org.apache.accumulo.core.spi.metrics.MeterRegistryFactory.InitParameters
initParameters =
- new MeterRegistryEnvPropImpl(context);
+ Class clazz =
+ ClassLoaderUtil.loadClass(factoryName, MeterRegistryFactory.class);
+ MeterRegistryFactory factory =
clazz.getDeclaredConstructor().newInstance();
+ MeterRegistryFactory.InitParameters initParameters = new
MeterRegistryEnvPropImpl(context);
return factory.create(initParameters);
} catch (ClassCastException ex) {
// empty. On exception try deprecated version
(accumulo) branch 2.1 updated: Backport IdleProcessMetricsIT from #4764
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 e16d51b457 Backport IdleProcessMetricsIT from #4764
e16d51b457 is described below
commit e16d51b457ae2dfb3fbc62745465baeaa5032580
Author: Christopher Tubbs
AuthorDate: Fri Jul 26 07:24:41 2024 -0400
Backport IdleProcessMetricsIT from #4764
* Backport the fix for the unused variable from #4764
* Also, simplify a few trivial reflection related exceptions by using
ReflectiveOperationException base class when the individual child
classes are not needed
---
.../java/org/apache/accumulo/core/clientImpl/ClientContext.java| 5 +
.../java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java | 7 ++-
.../apache/accumulo/manager/metrics/ReplicationMetricsTest.java| 2 +-
.../org/apache/accumulo/test/functional/IdleProcessMetricsIT.java | 4 +++-
4 files changed, 7 insertions(+), 11 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
index 75b63940ce..7c6ba76549 100644
--- a/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
+++ b/core/src/main/java/org/apache/accumulo/core/clientImpl/ClientContext.java
@@ -28,7 +28,6 @@ import static java.util.concurrent.TimeUnit.SECONDS;
import static
org.apache.accumulo.core.metadata.schema.TabletMetadata.ColumnType.LOCATION;
import java.lang.Thread.UncaughtExceptionHandler;
-import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.nio.file.Path;
import java.util.Collection;
@@ -206,9 +205,7 @@ public class ClientContext implements AccumuloClient {
}
});
return scanServerSelector;
-} catch (ClassNotFoundException | InstantiationException |
IllegalAccessException
-| IllegalArgumentException | InvocationTargetException |
NoSuchMethodException
-| SecurityException e) {
+} catch (ReflectiveOperationException | IllegalArgumentException |
SecurityException e) {
throw new RuntimeException("Error creating ScanServerSelector
implementation: " + clazz, e);
}
}
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java
b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java
index b1fcb8fa83..9053567dd5 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/metrics/MetricsInfoImpl.java
@@ -20,7 +20,6 @@ package org.apache.accumulo.server.metrics;
import static org.apache.hadoop.util.StringUtils.getTrimmedStrings;
-import java.lang.reflect.InvocationTargetException;
import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
@@ -247,8 +246,7 @@ public class MetricsInfoImpl implements MetricsInfo {
registry.config().commonTags(commonTags.values());
registry.config().meterFilter(replicationFilter);
addRegistry(registry);
- } catch (ClassNotFoundException | NoSuchMethodException |
InvocationTargetException
- | InstantiationException | IllegalAccessException ex) {
+ } catch (ReflectiveOperationException ex) {
LOG.warn("Could not load registry {}", factoryName, ex);
}
}
@@ -270,8 +268,7 @@ public class MetricsInfoImpl implements MetricsInfo {
@VisibleForTesting
@SuppressWarnings("deprecation")
static MeterRegistry getRegistryFromFactory(final String factoryName, final
ServerContext context)
- throws ClassNotFoundException, NoSuchMethodException,
InvocationTargetException,
- InstantiationException, IllegalAccessException {
+ throws ReflectiveOperationException {
try {
LOG.info("look for meter spi registry factory {}", factoryName);
Class clazz =
diff --git
a/server/manager/src/test/java/org/apache/accumulo/manager/metrics/ReplicationMetricsTest.java
b/server/manager/src/test/java/org/apache/accumulo/manager/metrics/ReplicationMetricsTest.java
index de9755e9a5..8e1312daeb 100644
---
a/server/manager/src/test/java/org/apache/accumulo/manager/metrics/ReplicationMetricsTest.java
+++
b/server/manager/src/test/java/org/apache/accumulo/manager/metrics/ReplicationMetricsTest.java
@@ -100,7 +100,7 @@ public class ReplicationMetricsTest {
}
private void replaceField(Object instance, String fieldName, Object target)
- throws NoSuchFieldException, IllegalAccessException {
+ throws ReflectiveOperationException {
Field field =
instance.getClass().getSuperclass().getDeclaredField(fieldName);
field.setAccessible(true);
field.set(instance, target);
dif
(accumulo) 01/01: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git commit ea48421dbee71c7812ec4baa52356285e784129a Merge: fc084cf9ef 3ee04b18b3 Author: Christopher Tubbs AuthorDate: Fri Jul 26 00:27:16 2024 -0400 Merge branch 'main' into elasticity .../java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --cc test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java index a7c666ee9c,ca54665742..8c04b63358 --- a/test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java @@@ -18,7 -18,8 +18,8 @@@ */ package org.apache.accumulo.test.functional; +import static org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP1; + import static org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.MAX_DATA; -import static org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.QUEUE1; import static org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.compact; import static org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.createTable; import static org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.verify;
(accumulo) branch elasticity updated (fc084cf9ef -> ea48421dbe)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from fc084cf9ef Merge branch 'main' into elasticity add 3ee04b18b3 Fix ReturnValueIgnored on IdleProcessMetricsIT (#4764) new ea48421dbe Merge branch 'main' into elasticity 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: .../java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
(accumulo) branch main updated: Fix ReturnValueIgnored on IdleProcessMetricsIT (#4764)
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
The following commit(s) were added to refs/heads/main by this push:
new 3ee04b18b3 Fix ReturnValueIgnored on IdleProcessMetricsIT (#4764)
3ee04b18b3 is described below
commit 3ee04b18b3de3d9a836b903340f067b45559e36d
Author: Daniel Roberts
AuthorDate: Fri Jul 26 00:18:20 2024 -0400
Fix ReturnValueIgnored on IdleProcessMetricsIT (#4764)
Fixes the compliation error with IdleProcessMetricsIT for not using the
return value of the stream.
---
.../org/apache/accumulo/test/functional/IdleProcessMetricsIT.java| 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java
index 05033b0e40..ca54665742 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java
@@ -18,11 +18,13 @@
*/
package org.apache.accumulo.test.functional;
+import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.MAX_DATA;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.QUEUE1;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.compact;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.createTable;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.verify;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.writeData;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
import java.time.Duration;
@@ -30,7 +32,6 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.function.Function;
import org.apache.accumulo.compactor.Compactor;
import org.apache.accumulo.coordinator.CompactionCoordinator;
@@ -220,7 +221,7 @@ public class IdleProcessMetricsIT extends
SharedMiniClusterBase {
try (Scanner scanner = client.createScanner(table1,
Authorizations.EMPTY)) {
scanner.setConsistencyLevel(ScannerBase.ConsistencyLevel.EVENTUAL);
-scanner.stream().forEach(Function.identity()::apply); // iterate and
ignore
+assertEquals(MAX_DATA, scanner.stream().count()); // Ensure that data
exists
}
log.info("Waiting for sserver to be not idle after starting a scan");
(accumulo) branch elasticity updated: Fixes the IdleProcessMetricsIT (#4759)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/elasticity by this push:
new 3ad9198a86 Fixes the IdleProcessMetricsIT (#4759)
3ad9198a86 is described below
commit 3ad9198a86ae9f8b2b24831f6593d33362f8088a
Author: Daniel Roberts
AuthorDate: Thu Jul 25 00:51:48 2024 -0400
Fixes the IdleProcessMetricsIT (#4759)
Starts the correct services for the scanServer test
Sets up the compaction service correctly and waits for
the compaction to be completed.
---
.../accumulo/test/functional/IdleProcessMetricsIT.java | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git
a/test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java
b/test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java
index afee144e95..a7c666ee9c 100644
---
a/test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/IdleProcessMetricsIT.java
@@ -18,6 +18,7 @@
*/
package org.apache.accumulo.test.functional;
+import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.GROUP1;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.compact;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.createTable;
import static
org.apache.accumulo.test.compaction.ExternalCompactionTestUtils.verify;
@@ -41,6 +42,7 @@ import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.iterators.IteratorUtil;
import org.apache.accumulo.core.metrics.MetricsProducer;
import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.spi.compaction.RatioBasedCompactionPlanner;
import org.apache.accumulo.harness.MiniClusterConfigurationCallback;
import org.apache.accumulo.harness.SharedMiniClusterBase;
import org.apache.accumulo.minicluster.ServerType;
@@ -85,6 +87,12 @@ public class IdleProcessMetricsIT extends
SharedMiniClusterBase {
cfg.getClusterServerConfiguration().addTabletServerResourceGroup(IDLE_RESOURCE_GROUP,
1);
cfg.getClusterServerConfiguration().addScanServerResourceGroup(IDLE_RESOURCE_GROUP,
1);
cfg.getClusterServerConfiguration().addCompactorResourceGroup(IDLE_RESOURCE_GROUP,
1);
+ cfg.getClusterServerConfiguration().addCompactorResourceGroup(GROUP1, 0);
+
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs1.planner",
+ RatioBasedCompactionPlanner.class.getName());
+ cfg.setProperty(Property.COMPACTION_SERVICE_PREFIX.getKey() +
"cs1.planner.opts.groups",
+ "[{'group':'" + GROUP1 + "'}]");
cfg.setProperty(Property.GENERAL_IDLE_PROCESS_INTERVAL,
idleProcessInterval.toSeconds() + "s");
@@ -170,6 +178,9 @@ public class IdleProcessMetricsIT extends
SharedMiniClusterBase {
try (AccumuloClient client =
Accumulo.newClient().from(getCluster().getClientProperties()).build())
{
+
getCluster().getConfig().getClusterServerConfiguration().addCompactorResourceGroup(GROUP1,
1);
+ getCluster().getClusterControl().start(ServerType.COMPACTOR);
+
// should emit the idle metric after the configured duration of
GENERAL_IDLE_PROCESS_INTERVAL
Thread.sleep(idleProcessInterval.toMillis());
@@ -187,7 +198,7 @@ public class IdleProcessMetricsIT extends
SharedMiniClusterBase {
client.tableOperations().attachIterator(table1, setting,
EnumSet.of(IteratorUtil.IteratorScope.majc));
- compact(client, table1, 2, IDLE_RESOURCE_GROUP, false);
+ compact(client, table1, 2, GROUP1, true);
log.info("Waiting for compactor to be not idle after starting
compaction");
waitForIdleMetricValueToBe(0, processName);
@@ -209,7 +220,8 @@ public class IdleProcessMetricsIT extends
SharedMiniClusterBase {
try (AccumuloClient client =
Accumulo.newClient().from(getCluster().getClientProperties()).build())
{
- getCluster().getClusterControl().start(ServerType.SCAN_SERVER,
"localhost");
+
getCluster().getConfig().getClusterServerConfiguration().setNumDefaultScanServers(1);
+ getCluster().getClusterControl().start(ServerType.SCAN_SERVER);
// should emit the idle metric after the configured duration of
GENERAL_IDLE_PROCESS_INTERVAL
Thread.sleep(idleProcessInterval.toMillis());
(accumulo) 01/02: Merge branch '2.1'
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 6eae7831fb7cb0ab4f7ba99bbc1d9d9b807445fc
Merge: 15035d7b27 85accd6b86
Author: Christopher Tubbs
AuthorDate: Thu Jul 25 00:17:26 2024 -0400
Merge branch '2.1'
.../java/org/apache/accumulo/core/conf/Property.java | 20
.../org/apache/accumulo/server/rpc/TServerUtils.java | 9 ++---
.../apache/accumulo/server/rpc/TServerUtilsTest.java | 3 +--
.../accumulo/coordinator/CompactionCoordinator.java | 5 +
.../org/apache/accumulo/compactor/Compactor.java | 6 +-
.../apache/accumulo/gc/SimpleGarbageCollector.java | 2 +-
.../java/org/apache/accumulo/manager/Manager.java| 3 +--
.../java/org/apache/accumulo/tserver/ScanServer.java | 5 +
.../org/apache/accumulo/tserver/TabletServer.java| 8 +++-
.../test/functional/IdleProcessMetricsIT.java| 3 ++-
.../test/functional/ThriftMaxFrameSizeIT.java| 3 +--
11 files changed, 18 insertions(+), 49 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 910293fd48,8629cf1681..647603b26f
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -263,8 -264,10 +266,6 @@@ public enum Property
+ " This does not equate to how often tickets are actually renewed
(which is"
+ " performed at 80% of the ticket lifetime).",
"1.6.5"),
- @Deprecated(since = "2.1.3")
- @ReplacedBy(property = RPC_MAX_MESSAGE_SIZE)
-- GENERAL_MAX_MESSAGE_SIZE("general.server.message.size.max", "1G",
PropertyType.BYTES,
-- "The maximum size of a message that can be sent to a server.", "1.5.0"),
@Experimental
GENERAL_OPENTELEMETRY_ENABLED("general.opentelemetry.enabled", "false",
PropertyType.BOOLEAN,
"Enables tracing functionality using OpenTelemetry (assuming
OpenTelemetry is configured).",
@@@ -725,8 -795,10 +723,6 @@@
"2.1.0"),
TSERV_THREADCHECK("tserver.server.threadcheck.time", "1s",
PropertyType.TIMEDURATION,
"The time between adjustments of the server thread pool.", "1.4.0"),
- @Deprecated(since = "2.1.3")
- @ReplacedBy(property = RPC_MAX_MESSAGE_SIZE)
-- TSERV_MAX_MESSAGE_SIZE("tserver.server.message.size.max", "1G",
PropertyType.BYTES,
-- "The maximum size of a message that can be sent to a tablet server.",
"1.6.0"),
TSERV_LOG_BUSY_TABLETS_COUNT("tserver.log.busy.tablets.count", "0",
PropertyType.COUNT,
"Number of busiest tablets to log. Logged at interval controlled by "
+ "tserver.log.busy.tablets.interval. If <= 0, logging of busy
tablets is disabled.",
@@@ -1187,12 -1483,6 +1183,9 @@@
@Experimental
COMPACTOR_THREADCHECK("compactor.threadcheck.time", "1s",
PropertyType.TIMEDURATION,
"The time between adjustments of the server thread pool.", "2.1.0"),
+ @Experimental
- COMPACTOR_MAX_MESSAGE_SIZE("compactor.message.size.max", "10M",
PropertyType.BYTES,
- "The maximum size of a message that can be sent to a tablet server.",
"2.1.0"),
- @Experimental
+ COMPACTOR_QUEUE_NAME("compactor.queue", "", PropertyType.STRING,
+ "The queue for which this Compactor will perform compactions.",
"3.0.0"),
// CompactionCoordinator properties
@Experimental
COMPACTION_COORDINATOR_PREFIX("compaction.coordinator.", null,
PropertyType.PREFIX,
@@@ -1516,8 -1849,7 +1505,7 @@@
COMPACTOR_PORTSEARCH, TSERV_PORTSEARCH,
// max message options
- SSERV_MAX_MESSAGE_SIZE, TSERV_MAX_MESSAGE_SIZE,
COMPACTOR_MAX_MESSAGE_SIZE,
- COMPACTION_COORDINATOR_MAX_MESSAGE_SIZE,
- TSERV_MAX_MESSAGE_SIZE, GENERAL_MAX_MESSAGE_SIZE, RPC_MAX_MESSAGE_SIZE,
++ RPC_MAX_MESSAGE_SIZE,
// block cache options
TSERV_CACHE_MANAGER_IMPL, TSERV_DATACACHE_SIZE, TSERV_INDEXCACHE_SIZE,
diff --cc
server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
index f9359b8442,87bfb4c0c8..5d9b44bbf5
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TServerUtils.java
@@@ -125,15 -125,15 +125,13 @@@ public class TServerUtils
* @param minThreadProperty A Property to control the minimum number of
threads in the pool
* @param timeBetweenThreadChecksProperty A Property to control the amount
of time between checks
*to resize th
(accumulo) 02/02: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 03caeb01ff135c36cbc10b701d1aef7dd2e6dba4
Merge: 4385344c9b 6eae7831fb
Author: Christopher Tubbs
AuthorDate: Thu Jul 25 00:46:30 2024 -0400
Merge branch 'main' into elasticity
.../main/java/org/apache/accumulo/core/conf/Property.java | 15 ---
.../java/org/apache/accumulo/server/rpc/TServerUtils.java | 9 ++---
.../org/apache/accumulo/server/rpc/TServerUtilsTest.java | 3 +--
.../java/org/apache/accumulo/compactor/Compactor.java | 6 +-
.../org/apache/accumulo/gc/SimpleGarbageCollector.java| 2 +-
.../main/java/org/apache/accumulo/manager/Manager.java| 3 +--
.../main/java/org/apache/accumulo/tserver/ScanServer.java | 5 +
.../java/org/apache/accumulo/tserver/TabletServer.java| 8 +++-
.../accumulo/test/functional/ThriftMaxFrameSizeIT.java| 3 +--
9 files changed, 15 insertions(+), 39 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 560a2f2f76,647603b26f..ce425a8940
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@@ -1136,11 -1184,8 +1132,8 @@@ public enum Property
COMPACTOR_THREADCHECK("compactor.threadcheck.time", "1s",
PropertyType.TIMEDURATION,
"The time between adjustments of the server thread pool.", "2.1.0"),
@Experimental
- COMPACTOR_MAX_MESSAGE_SIZE("compactor.message.size.max", "10M",
PropertyType.BYTES,
- "The maximum size of a message that can be sent to a tablet server.",
"2.1.0"),
- @Experimental
- COMPACTOR_QUEUE_NAME("compactor.queue", "", PropertyType.STRING,
- "The queue for which this Compactor will perform compactions.",
"3.0.0"),
+ COMPACTOR_GROUP_NAME("compactor.group",
Constants.DEFAULT_RESOURCE_GROUP_NAME,
+ PropertyType.STRING, "Resource group name for this Compactor.",
"3.0.0"),
// CompactionCoordinator properties
@Experimental
COMPACTION_COORDINATOR_PREFIX("compaction.coordinator.", null,
PropertyType.PREFIX,
diff --cc
server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index 9e34947cf3,1af688515c..bf54437d73
---
a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++
b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@@ -332,12 -318,9 +332,9 @@@ public class Compactor extends Abstract
*/
protected ServerAddress startCompactorClientService() throws
UnknownHostException {
-ClientServiceHandler clientHandler =
-new ClientServiceHandler(getContext(), new
TransactionWatcher(getContext()));
-var processor =
ThriftProcessorTypes.getCompactorTProcessor(clientHandler, this, getContext());
+ClientServiceHandler clientHandler = new
ClientServiceHandler(getContext());
+var processor = ThriftProcessorTypes.getCompactorTProcessor(clientHandler,
+getCompactorThriftHandlerInterface(), getContext());
- Property maxMessageSizeProperty =
- (getConfiguration().get(Property.COMPACTOR_MAX_MESSAGE_SIZE) != null
- ? Property.COMPACTOR_MAX_MESSAGE_SIZE :
Property.GENERAL_MAX_MESSAGE_SIZE);
ServerAddress sp = TServerUtils.startServer(getContext(), getHostname(),
Property.COMPACTOR_CLIENTPORT, processor,
this.getClass().getSimpleName(),
"Thrift Client Server", Property.COMPACTOR_PORTSEARCH,
Property.COMPACTOR_MINTHREADS,
diff --cc
test/src/main/java/org/apache/accumulo/test/functional/ThriftMaxFrameSizeIT.java
index d8ae2d2022,faf15ce6d6..773a18b84f
---
a/test/src/main/java/org/apache/accumulo/test/functional/ThriftMaxFrameSizeIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/functional/ThriftMaxFrameSizeIT.java
@@@ -89,11 -89,10 +89,10 @@@ public class ThriftMaxFrameSizeIT
@Override
public void configure(MiniAccumuloConfigImpl cfg, Configuration
hadoopCoreSite) {
- cfg.setNumTservers(1);
+ cfg.getClusterServerConfiguration().setNumDefaultTabletServers(1);
cfg.setProperty(Property.GENERAL_RPC_SERVER_TYPE, serverType.name());
String maxFrameSizeStr = Integer.toString(CONFIGURED_MAX_FRAME_SIZE);
- cfg.setProperty(Property.GENERAL_MAX_MESSAGE_SIZE, maxFrameSizeStr);
- cfg.setProperty(Property.TSERV_MAX_MESSAGE_SIZE, maxFrameSizeStr);
+ cfg.setProperty(Property.RPC_MAX_MESSAGE_SIZE, maxFrameSizeStr);
if (serverType == ThriftServerType.SSL) {
configureForSsl(cfg,
getSslDir(createTestDir(this.getClass().getName() + "_" +
this.testName(;
(accumulo) branch main updated (15035d7b27 -> 6eae7831fb)
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 15035d7b27 Update ScanServerRefFile format to sort on UUID (#4691) add 85accd6b86 Increase Thrift max message size defaults (#3873) new 6eae7831fb 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: .../java/org/apache/accumulo/core/conf/Property.java | 20 .../org/apache/accumulo/server/rpc/TServerUtils.java | 9 ++--- .../apache/accumulo/server/rpc/TServerUtilsTest.java | 3 +-- .../accumulo/coordinator/CompactionCoordinator.java | 5 + .../org/apache/accumulo/compactor/Compactor.java | 6 +- .../apache/accumulo/gc/SimpleGarbageCollector.java | 2 +- .../java/org/apache/accumulo/manager/Manager.java| 3 +-- .../java/org/apache/accumulo/tserver/ScanServer.java | 5 + .../org/apache/accumulo/tserver/TabletServer.java| 8 +++- .../test/functional/IdleProcessMetricsIT.java| 3 ++- .../test/functional/ThriftMaxFrameSizeIT.java| 3 +-- 11 files changed, 18 insertions(+), 49 deletions(-)
(accumulo) branch elasticity updated (4385344c9b -> 03caeb01ff)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from 4385344c9b Merge branch 'main' into elasticity add 85accd6b86 Increase Thrift max message size defaults (#3873) new 6eae7831fb Merge branch '2.1' new 03caeb01ff Merge branch 'main' into elasticity 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. Summary of changes: .../main/java/org/apache/accumulo/core/conf/Property.java | 15 --- .../java/org/apache/accumulo/server/rpc/TServerUtils.java | 9 ++--- .../org/apache/accumulo/server/rpc/TServerUtilsTest.java | 3 +-- .../java/org/apache/accumulo/compactor/Compactor.java | 6 +- .../org/apache/accumulo/gc/SimpleGarbageCollector.java| 2 +- .../main/java/org/apache/accumulo/manager/Manager.java| 3 +-- .../main/java/org/apache/accumulo/tserver/ScanServer.java | 5 + .../java/org/apache/accumulo/tserver/TabletServer.java| 8 +++- .../accumulo/test/functional/ThriftMaxFrameSizeIT.java| 3 +-- 9 files changed, 15 insertions(+), 39 deletions(-)
(accumulo) branch 2.1 updated: Increase Thrift max message size defaults (#3873)
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 85accd6b86 Increase Thrift max message size defaults (#3873)
85accd6b86 is described below
commit 85accd6b861d5fd0038bf0fa63181b6e60af64cb
Author: Christopher Tubbs
AuthorDate: Wed Jul 24 21:16:32 2024 -0400
Increase Thrift max message size defaults (#3873)
* Deprecate max message properties in favor of a replacement
* Simply remove the experimental ones (but they could be restored and
deprecated like the non-experimental ones, if that's desired)
* Ensure new property defaults to `Integer.MAX_VALUE`
* Handle detecting whether a user set the new property and fall back on
the old properties if a user customized them already
* Set the default value for the maxMessageSize to `Integer.MAX_VALUE` in
`TServerUtils`. However, that case should only apply when the property
passed to the method is `null`, which it never should be. A future
improvement could validate that the property is non-null instead.
* Ensure all the max message properties that remain are added to the
fixed properties, since they all require a restart to take effect
* Slightly simplify related code in `TabletServer` to avoid passing
`AccumuloConfiguration` when it's already available via a class method
This fixes #3094
This fixes #3739
This fixes #3791
---
.../java/org/apache/accumulo/core/conf/Property.java | 20
.../org/apache/accumulo/server/rpc/TServerUtils.java | 2 +-
.../apache/accumulo/server/rpc/TServerUtilsTest.java | 2 +-
.../accumulo/coordinator/CompactionCoordinator.java | 6 +++---
.../org/apache/accumulo/compactor/Compactor.java | 6 +++---
.../apache/accumulo/gc/SimpleGarbageCollector.java | 5 -
.../java/org/apache/accumulo/manager/Manager.java| 10 --
.../java/org/apache/accumulo/tserver/ScanServer.java | 6 +++---
.../org/apache/accumulo/tserver/TabletServer.java| 14 +++---
.../test/functional/ThriftMaxFrameSizeIT.java| 3 +--
10 files changed, 39 insertions(+), 35 deletions(-)
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 445e693c60..8629cf1681 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
@@ -54,6 +54,9 @@ public enum Property {
"Properties in this category related to the configuration of SSL keys
for"
+ " RPC. See also `instance.ssl.enabled`.",
"1.6.0"),
+ RPC_MAX_MESSAGE_SIZE("rpc.message.size.max",
Integer.toString(Integer.MAX_VALUE),
+ PropertyType.BYTES, "The maximum size of a message that can be received
by a server.",
+ "2.1.3"),
RPC_BACKLOG("rpc.backlog", "50", PropertyType.COUNT,
"Configures the TCP backlog for the server side sockets created by
Thrift."
+ " This property is not used for SSL type server sockets. A value
of zero"
@@ -261,6 +264,8 @@ public enum Property {
+ " This does not equate to how often tickets are actually renewed
(which is"
+ " performed at 80% of the ticket lifetime).",
"1.6.5"),
+ @Deprecated(since = "2.1.3")
+ @ReplacedBy(property = RPC_MAX_MESSAGE_SIZE)
GENERAL_MAX_MESSAGE_SIZE("general.server.message.size.max", "1G",
PropertyType.BYTES,
"The maximum size of a message that can be sent to a server.", "1.5.0"),
@Experimental
@@ -468,9 +473,6 @@ public enum Property {
SSERV_CLIENTPORT("sserver.port.client", "9996", PropertyType.PORT,
"The port used for handling client connections on the tablet servers.",
"2.1.0"),
@Experimental
- SSERV_MAX_MESSAGE_SIZE("sserver.server.message.size.max", "1G",
PropertyType.BYTES,
- "The maximum size of a message that can be sent to a scan server.",
"2.1.0"),
- @Experimental
SSERV_MINTHREADS("sserver.server.threads.minimum", "2", PropertyType.COUNT,
"The minimum number of threads to use to handle incoming requests.",
"2.1.0"),
@Experimental
@@ -793,6 +795,8 @@ public enum Property {
"2.1.0"),
TSERV_THREADCHECK("tserver.server.threadcheck.time", "1s",
PropertyType.TIMEDURATION,
"The time between adjustments of the server thread pool.", "1.4.0"),
+ @Deprecated(since = "2.1.3")
+ @ReplacedBy(property = RPC_MA
(accumulo) branch main updated (3c5bb40ae9 -> 62cd737399)
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 3c5bb40ae9 Merge branch '2.1' add 9bd6a8d403 Make isPropertySet work for fixed properties (#4752) add f54a2b214a Fix CredentialProviderToken serialization (#4580) new 62cd737399 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: .../security/tokens/CredentialProviderToken.java | 26 - .../core/client/security/tokens/PasswordToken.java | 1 + .../accumulo/core/conf/AccumuloConfiguration.java | 4 +- .../org/apache/accumulo/core/conf/Property.java| 6 +- .../org/apache/accumulo/core/util/CreateToken.java | 2 +- .../tokens/CredentialProviderTokenTest.java| 65 - core/src/test/resources/passwords.jceks| Bin 963 -> 967 bytes .../server/conf/RuntimeFixedProperties.java| 13 + .../accumulo/server/conf/SystemConfiguration.java | 5 +- .../AccumuloConfigurationIsPropertySetTest.java| 28 +++-- .../server/conf/SystemConfigurationTest.java | 5 +- .../org/apache/accumulo/tserver/ScanServer.java| 2 +- .../accumulo/test/ScanServerMetadataEntriesIT.java | 2 +- 13 files changed, 130 insertions(+), 29 deletions(-)
(accumulo) 01/03: Merge branch '2.1'
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 62cd737399b4a0a8a0bcef6eef6180b3ec3df48c
Merge: 3c5bb40ae9 f54a2b214a
Author: Christopher Tubbs
AuthorDate: Wed Jul 24 09:18:39 2024 -0400
Merge branch '2.1'
.../security/tokens/CredentialProviderToken.java | 26 -
.../core/client/security/tokens/PasswordToken.java | 1 +
.../accumulo/core/conf/AccumuloConfiguration.java | 4 +-
.../org/apache/accumulo/core/conf/Property.java| 6 +-
.../org/apache/accumulo/core/util/CreateToken.java | 2 +-
.../tokens/CredentialProviderTokenTest.java| 65 -
core/src/test/resources/passwords.jceks| Bin 963 -> 967 bytes
.../server/conf/RuntimeFixedProperties.java| 13 +
.../accumulo/server/conf/SystemConfiguration.java | 5 +-
.../AccumuloConfigurationIsPropertySetTest.java| 28 +++--
.../server/conf/SystemConfigurationTest.java | 5 +-
.../org/apache/accumulo/tserver/ScanServer.java| 2 +-
.../accumulo/test/ScanServerMetadataEntriesIT.java | 2 +-
13 files changed, 130 insertions(+), 29 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/util/CreateToken.java
index cccd00f263,f17cf675d6..80cfa9dec9
--- a/core/src/main/java/org/apache/accumulo/core/util/CreateToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/CreateToken.java
@@@ -86,35 -86,34 +86,35 @@@ public class CreateToken implements Key
pass = opts.securePassword;
}
-try {
- String principal = opts.principal;
- if (principal == null) {
-principal = getConsoleReader().readLine("Username (aka principal): ");
- }
+String principal = opts.principal;
+if (principal == null) {
+ principal = getConsoleReader().readLine("Username (aka principal): ");
+}
- AuthenticationToken token = Class.forName(opts.tokenClassName)
-
.asSubclass(AuthenticationToken.class).getDeclaredConstructor().newInstance();
- Properties props = new Properties();
- for (TokenProperty tp : token.getProperties()) {
-String input;
-if (pass != null && tp.getKey().equals("password")) {
- input = pass;
+AuthenticationToken token;
+try {
+ token =
Class.forName(opts.tokenClassName).asSubclass(AuthenticationToken.class)
+ .getDeclaredConstructor().newInstance();
+} catch (ReflectiveOperationException e) {
+ throw new IllegalStateException(e);
+}
+Properties props = new Properties();
+for (TokenProperty tp : token.getProperties()) {
+ String input;
+ if (pass != null && tp.getKey().equals("password")) {
+input = pass;
+ } else {
+if (tp.getMask()) {
+ input = getConsoleReader().readLine(tp.getDescription() + ": ",
'*');
} else {
- if (tp.getMask()) {
-input = getConsoleReader().readLine(tp.getDescription() + ": ",
'*');
- } else {
-input = getConsoleReader().readLine(tp.getDescription() + ": ");
- }
+ input = getConsoleReader().readLine(tp.getDescription() + ": ");
}
-props.put(tp.getKey(), input);
}
- token.init(props);
- System.out.println("auth.type = " + opts.tokenClassName);
- System.out.println("auth.principal = " + principal);
- System.out.println("auth.token = " + ClientProperty.encodeToken(token));
-} catch (ReflectiveOperationException e) {
- throw new RuntimeException(e);
+ props.put(tp.getKey(), input);
- token.init(props);
}
++token.init(props);
+System.out.println("auth.type = " + opts.tokenClassName);
+System.out.println("auth.principal = " + principal);
+System.out.println("auth.token = " + ClientProperty.encodeToken(token));
}
}
(accumulo) 03/03: Fix spotbugs error for unused member
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 8460c6409d2e6be0bbf6952c3c8063dd9e3f1864
Author: Christopher Tubbs
AuthorDate: Wed Jul 24 10:23:47 2024 -0400
Fix spotbugs error for unused member
---
.../src/main/java/org/apache/accumulo/compactor/Compactor.java | 2 --
1 file changed, 2 deletions(-)
diff --git
a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
index 17be7f47f8..9e34947cf3 100644
---
a/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
+++
b/server/compactor/src/main/java/org/apache/accumulo/compactor/Compactor.java
@@ -34,7 +34,6 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.atomic.LongAdder;
import java.util.function.Supplier;
@@ -709,7 +708,6 @@ public class Compactor extends AbstractServer implements
MetricsProducer, Compac
try {
final AtomicReference err = new AtomicReference<>();
- final AtomicLong timeSinceLastCompletion = new AtomicLong(0L);
final LogSorter logSorter = new LogSorter(getContext(),
getConfiguration());
long nextSortLogsCheckTime = System.currentTimeMillis();
(accumulo) 02/03: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 9990e2bb75e273a16175393915c7957467b1defd
Merge: cbb9efdece 62cd737399
Author: Christopher Tubbs
AuthorDate: Wed Jul 24 10:02:35 2024 -0400
Merge branch 'main' into elasticity
.../security/tokens/CredentialProviderToken.java | 26 -
.../core/client/security/tokens/PasswordToken.java | 1 +
.../accumulo/core/conf/AccumuloConfiguration.java | 4 +-
.../org/apache/accumulo/core/conf/Property.java| 6 +-
.../org/apache/accumulo/core/util/CreateToken.java | 2 +-
.../tokens/CredentialProviderTokenTest.java| 65 -
core/src/test/resources/passwords.jceks| Bin 963 -> 967 bytes
.../server/conf/RuntimeFixedProperties.java| 13 +
.../accumulo/server/conf/SystemConfiguration.java | 5 +-
.../AccumuloConfigurationIsPropertySetTest.java| 28 +++--
.../server/conf/SystemConfigurationTest.java | 5 +-
.../org/apache/accumulo/tserver/ScanServer.java| 2 +-
.../accumulo/test/ScanServerMetadataEntriesIT.java | 2 +-
13 files changed, 130 insertions(+), 29 deletions(-)
diff --cc
test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
index 5d958a6ee8,da0e141732..e620b5ba50
---
a/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
+++
b/test/src/main/java/org/apache/accumulo/test/ScanServerMetadataEntriesIT.java
@@@ -78,9 -78,9 +78,9 @@@ public class ScanServerMetadataEntriesI
@Override
public void configureMiniCluster(MiniAccumuloConfigImpl cfg,
org.apache.hadoop.conf.Configuration coreSite) {
- cfg.setNumScanServers(1);
+ cfg.getClusterServerConfiguration().setNumDefaultScanServers(1);
cfg.setProperty(Property.TSERV_SESSION_MAXIDLE, "3s");
- cfg.setProperty(Property.SSERVER_SCAN_REFERENCE_EXPIRATION_TIME, "5s");
+ cfg.setProperty(Property.SSERV_SCAN_REFERENCE_EXPIRATION_TIME, "5s");
}
}
(accumulo) branch elasticity updated (cbb9efdece -> 8460c6409d)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from cbb9efdece Merge branch 'main' into elasticity add 9bd6a8d403 Make isPropertySet work for fixed properties (#4752) add f54a2b214a Fix CredentialProviderToken serialization (#4580) new 62cd737399 Merge branch '2.1' new 9990e2bb75 Merge branch 'main' into elasticity new 8460c6409d Fix spotbugs error for unused member The 3 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: .../security/tokens/CredentialProviderToken.java | 26 - .../core/client/security/tokens/PasswordToken.java | 1 + .../accumulo/core/conf/AccumuloConfiguration.java | 4 +- .../org/apache/accumulo/core/conf/Property.java| 6 +- .../org/apache/accumulo/core/util/CreateToken.java | 2 +- .../tokens/CredentialProviderTokenTest.java| 65 - core/src/test/resources/passwords.jceks| Bin 963 -> 967 bytes .../server/conf/RuntimeFixedProperties.java| 13 + .../accumulo/server/conf/SystemConfiguration.java | 5 +- .../AccumuloConfigurationIsPropertySetTest.java| 28 +++-- .../server/conf/SystemConfigurationTest.java | 5 +- .../org/apache/accumulo/compactor/Compactor.java | 2 - .../org/apache/accumulo/tserver/ScanServer.java| 2 +- .../accumulo/test/ScanServerMetadataEntriesIT.java | 2 +- 14 files changed, 130 insertions(+), 31 deletions(-)
(accumulo) branch 2.1 updated: Make isPropertySet work for fixed properties (#4752)
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 9bd6a8d403 Make isPropertySet work for fixed properties (#4752)
9bd6a8d403 is described below
commit 9bd6a8d40314626c9d1da0bec2f807640aff253d
Author: Christopher Tubbs
AuthorDate: Wed Jul 24 09:05:52 2024 -0400
Make isPropertySet work for fixed properties (#4752)
* Add more comments (including javadocs) to explain fixed properties
* Add the ability to track whether a fixed property was set on startup
by recording the runtime state of whether a user had set the property
or not
* Update AccumuloConfigurationIsPropertySetTest to ensure that the
runtime properties behavior is working correctly
* Also, rename a scan server property enum to match the others
This fixes #3529
---
.../accumulo/core/conf/AccumuloConfiguration.java | 4 +++-
.../org/apache/accumulo/core/conf/Property.java| 6 +++--
.../server/conf/RuntimeFixedProperties.java| 13 ++
.../accumulo/server/conf/SystemConfiguration.java | 5 +++-
.../AccumuloConfigurationIsPropertySetTest.java| 28 ++
.../server/conf/SystemConfigurationTest.java | 5 ++--
.../org/apache/accumulo/tserver/ScanServer.java| 2 +-
.../accumulo/test/ScanServerMetadataEntriesIT.java | 2 +-
8 files changed, 52 insertions(+), 13 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
index 5ad65b371e..faba4facc7 100644
---
a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
+++
b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
@@ -432,7 +432,9 @@ public abstract class AccumuloConfiguration implements
Iterable fixedProperties = EnumSet.of(
// port options
GC_PORT, MANAGER_CLIENTPORT, TSERV_CLIENTPORT, SSERV_CLIENTPORT,
SSERV_PORTSEARCH,
@@ -1861,7 +1863,7 @@ public enum Property {
TSERV_DEFAULT_BLOCKSIZE, SSERV_DEFAULT_BLOCKSIZE,
// sserver specific options
- SSERVER_SCAN_REFERENCE_EXPIRATION_TIME,
SSERV_CACHED_TABLET_METADATA_EXPIRATION,
+ SSERV_SCAN_REFERENCE_EXPIRATION_TIME,
SSERV_CACHED_TABLET_METADATA_EXPIRATION,
// thread options
TSERV_MINTHREADS, TSERV_MINTHREADS_TIMEOUT, SSERV_MINTHREADS,
SSERV_MINTHREADS_TIMEOUT,
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/conf/RuntimeFixedProperties.java
b/server/base/src/main/java/org/apache/accumulo/server/conf/RuntimeFixedProperties.java
index 959402f0dc..4d56771324 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/conf/RuntimeFixedProperties.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/conf/RuntimeFixedProperties.java
@@ -22,7 +22,9 @@ import static java.util.Objects.requireNonNull;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.conf.SiteConfiguration;
@@ -52,6 +54,9 @@ public class RuntimeFixedProperties {
// original, stored fixed props.
private final Map origStored = new HashMap<>();
+ // the set of properties that were set by the user when they were fixed
+ private final Set wasSetByUser = new HashSet<>();
+
public RuntimeFixedProperties(final Map storedProps,
final SiteConfiguration siteConfig) {
requireNonNull(siteConfig, "a site configuration must be provided");
@@ -62,9 +67,13 @@ public class RuntimeFixedProperties {
// use value in ZooKeeper
if (value != null) {
origStored.put(key, value);
+wasSetByUser.add(prop);
} else {
// Not in ZK, use config or default.
value = siteConfig.get(prop);
+if (siteConfig.isPropertySet(prop)) {
+ wasSetByUser.add(prop);
+}
}
fixed.put(key, value);
log.trace("fixed property name: {} = {}", key, value);
@@ -76,6 +85,10 @@ public class RuntimeFixedProperties {
return fixed.get(property.getKey());
}
+ public boolean wasPropertySet(final Property property) {
+return wasSetByUser.contains(property);
+ }
+
@VisibleForTesting
Map getAll() {
return Collections.unmodifiableMap(fixed);
diff --git
a/server/base/src/main/java/org/apache/accumulo/server/conf/SystemConfiguration.java
b/server/base/src/main/java/org/apache/accumulo/server/conf/SystemConfiguration.java
index d4b79aed28..809f23c306 100644
---
a/server/base/src/main/java/org/apache/accumulo/server/conf/SystemConfiguration.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/conf/SystemConfiguration.jav
(accumulo) branch 2.1 updated: Fix CredentialProviderToken serialization (#4580)
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 f54a2b214a Fix CredentialProviderToken serialization (#4580)
f54a2b214a is described below
commit f54a2b214ab5ac38452536d5c9fd992813b1ba45
Author: Christopher Tubbs
AuthorDate: Wed Jul 24 09:07:08 2024 -0400
Fix CredentialProviderToken serialization (#4580)
* Fix the serialization of CredentialProviderToken, so it serializes the
name and credential provider paths, rather than the resolved password
from the provider
* Add comments to reserve specific magic numbers/versions for
serialization to separate it from PasswordToken's serialization
* Mark internal method as private
* Also fix issue in CreateToken where only the most recent property was
being used to initialize a token, instead of all the properties
* Add test of end-to-end serialization and deserialization
* Use var in a few more places
* Update test keystore with unique passwords for each jceks entry
* Document hadoop commands for modifying the jceks files
This fixes #4573
---
.../security/tokens/CredentialProviderToken.java | 26 -
.../core/client/security/tokens/PasswordToken.java | 1 +
.../org/apache/accumulo/core/util/CreateToken.java | 2 +-
.../tokens/CredentialProviderTokenTest.java| 65 -
core/src/test/resources/passwords.jceks| Bin 963 -> 967 bytes
5 files changed, 78 insertions(+), 16 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
index 4db45c8f4e..66af59395b 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/CredentialProviderToken.java
@@ -20,6 +20,8 @@ package org.apache.accumulo.core.client.security.tokens;
import static java.util.Objects.requireNonNull;
+import java.io.DataInput;
+import java.io.DataOutput;
import java.io.IOException;
import java.nio.CharBuffer;
import java.util.LinkedHashSet;
@@ -46,7 +48,7 @@ public class CredentialProviderToken extends PasswordToken {
setWithCredentialProviders(name, credentialProviders);
}
- protected void setWithCredentialProviders(String name, String
credentialProviders)
+ private void setWithCredentialProviders(String name, String
credentialProviders)
throws IOException {
this.name = name;
this.credentialProviders = credentialProviders;
@@ -63,6 +65,25 @@ public class CredentialProviderToken extends PasswordToken {
setPassword(CharBuffer.wrap(password));
}
+ @Override
+ public void readFields(DataInput arg0) throws IOException {
+// -1000 to -1999 is reserved for CredentialProviderToken; see
PasswordToken
+int version = arg0.readInt();
+if (version != -1000) {
+ throw new IOException("Invalid CredentialProviderToken");
+}
+name = arg0.readUTF();
+credentialProviders = arg0.readUTF();
+setWithCredentialProviders(name, credentialProviders);
+ }
+
+ @Override
+ public void write(DataOutput arg0) throws IOException {
+arg0.writeInt(-1000);
+arg0.writeUTF(name);
+arg0.writeUTF(credentialProviders);
+ }
+
/**
* @return Name used to extract Accumulo user password from
CredentialProvider
*
@@ -114,7 +135,8 @@ public class CredentialProviderToken extends PasswordToken {
@Override
public CredentialProviderToken clone() {
CredentialProviderToken clone = (CredentialProviderToken) super.clone();
-clone.setPassword(this.getPassword());
+clone.name = name;
+clone.credentialProviders = credentialProviders;
return clone;
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
index 8390f0f6e1..45f51cc4de 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
@@ -89,6 +89,7 @@ public class PasswordToken implements AuthenticationToken {
int version = arg0.readInt();
// -1 is null, consistent with legacy format; legacy format length must be
>= -1
// so, use -2 as a magic number to indicate the new format
+// -1000 to -1999 is reserved for CredentialProviderToken
if (version == -1) {
password = null;
} else if (version == -2) {
diff --git a/core/src/main/java/org/apache/accumulo/core/util/CreateToken.java
b/core/src/main/java/org/apache/accumulo/core/util/C
(accumulo) branch elasticity updated (6c2f6873dd -> 552adf2e1e)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from 6c2f6873dd Merge branch 'main' into elasticity add d54b4e57bc Cleanup of main branch (#4747) new 552adf2e1e Merge branch 'main' into elasticity 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: assemble/pom.xml | 1 + core/pom.xml | 30 .../core/client/admin/ActiveCompaction.java| 2 +- .../core/metrics/MeterRegistryFactory.java | 30 .../core/security/ColumnVisibilityTest.java| 83 -- minicluster/pom.xml| 7 ++ .../server/compaction/RetryableThriftCall.java | 2 - .../accumulo/server/metrics/MetricsInfoImpl.java | 24 ++- .../server/metrics/MetricsInfoImplTest.java| 17 - .../accumulo/tserver/session/SessionManager.java | 6 +- start/pom.xml | 6 -- test/pom.xml | 10 +-- .../accumulo/test/functional/CompactionIT.java | 31 13 files changed, 81 insertions(+), 168 deletions(-) delete mode 100644 core/src/main/java/org/apache/accumulo/core/metrics/MeterRegistryFactory.java
(accumulo) 01/01: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 552adf2e1efef005eaa187caeb6bdbc4dc186ea1 Merge: 6c2f6873dd d54b4e57bc Author: Christopher Tubbs AuthorDate: Wed Jul 24 00:24:04 2024 -0400 Merge branch 'main' into elasticity assemble/pom.xml | 1 + core/pom.xml | 30 .../core/client/admin/ActiveCompaction.java| 2 +- .../core/metrics/MeterRegistryFactory.java | 30 .../core/security/ColumnVisibilityTest.java| 83 -- minicluster/pom.xml| 7 ++ .../server/compaction/RetryableThriftCall.java | 2 - .../accumulo/server/metrics/MetricsInfoImpl.java | 24 ++- .../server/metrics/MetricsInfoImplTest.java| 17 - .../accumulo/tserver/session/SessionManager.java | 6 +- start/pom.xml | 6 -- test/pom.xml | 10 +-- .../accumulo/test/functional/CompactionIT.java | 31 13 files changed, 81 insertions(+), 168 deletions(-) diff --cc test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java index e110786f15,3e69c84897..1a2a313ee0 --- a/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java +++ b/test/src/main/java/org/apache/accumulo/test/functional/CompactionIT.java @@@ -24,10 -23,11 +24,9 @@@ import static java.util.stream.Collecto import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; 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 static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; - import java.io.UncheckedIOException; import java.nio.file.FileVisitResult; import java.nio.file.Files; import java.nio.file.Paths;
(accumulo) branch main updated: Cleanup of main branch (#4747)
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
The following commit(s) were added to refs/heads/main by this push:
new d54b4e57bc Cleanup of main branch (#4747)
d54b4e57bc is described below
commit d54b4e57bc0359228586c683c652136775dd8f3a
Author: Christopher Tubbs
AuthorDate: Tue Jul 23 23:57:04 2024 -0400
Cleanup of main branch (#4747)
* Cleanup of main branch
* Remove log4j-1.2-api dependency except as a bridge in the binary
assembly (left a note in the assemble/pom.xml), and as a runtime
dependency of hadoop minicluster, in the proper scope where needed
* Move log4j dependencies in core back to test scope. These were moved
to the provided scope in #4743 to work around an issue because
log4j-1.2-api was still used in the core module in 2.1; now that the
legacy log4j stuff was removed from core in 3.1 and later, we can move
these back to the test scope where they belong as #4558 intended
* Specify the exact version for deprecation "since" parameters (3.1.0,
instead of 3.1)
* Drop the unused and deprecated `tserver.workq.threads` property
* Remove a few unused imports and variables, and drop the legacy
MeterRegistryFactory that was deprecated in 2.1.3
* Suppress some deprecation warnings and use var in a few places for
readability
* Delete unused test code in CompactionIT
---
assemble/pom.xml | 1 +
core/pom.xml | 30
.../core/client/admin/ActiveCompaction.java| 2 +-
.../org/apache/accumulo/core/conf/Property.java| 42 +--
.../core/metadata/schema/TabletMetadata.java | 1 -
.../core/metrics/MeterRegistryFactory.java | 30
.../core/spi/balancer/data/TabletStatistics.java | 2 +-
.../core/spi/compaction/CompactionKind.java| 5 +-
.../accumulo/core/util/threads/ThreadPools.java| 6 --
.../core/security/ColumnVisibilityTest.java| 83 --
minicluster/pom.xml| 7 ++
.../server/compaction/RetryableThriftCall.java | 2 -
.../accumulo/server/metrics/MetricsInfoImpl.java | 24 ++-
.../server/metrics/MetricsInfoImplTest.java| 17 -
.../accumulo/server/util/ServiceStatusCmdTest.java | 2 -
.../coordinator/CompactionCoordinator.java | 1 -
.../accumulo/tserver/session/SessionManager.java | 6 +-
start/pom.xml | 6 --
test/pom.xml | 10 +--
.../accumulo/test/functional/CompactionIT.java | 31
20 files changed, 102 insertions(+), 206 deletions(-)
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 4b7fe16968..771b6f3c62 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -283,6 +283,7 @@
true
+
org.apache.logging.log4j
log4j-1.2-api
true
diff --git a/core/pom.xml b/core/pom.xml
index fcaecd8c8c..990f853a59 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -113,11 +113,6 @@
org.apache.hadoop
hadoop-client-api
-
-
- org.apache.logging.log4j
- log4j-1.2-api
-
org.apache.thrift
libthrift
@@ -142,26 +137,31 @@
org.yaml
snakeyaml
+
+ org.apache.hadoop
+ hadoop-client-runtime
+ runtime
+
biz.aQute.bnd
biz.aQute.bnd.annotation
- provided
+ test
-
- org.apache.logging.log4j
- log4j-api
- provided
+ org.apache.hadoop
+ hadoop-client-minicluster
+ test
- org.apache.hadoop
- hadoop-client-runtime
- runtime
+
+ org.apache.logging.log4j
+ log4j-1.2-api
+ test
- org.apache.hadoop
- hadoop-client-minicluster
+ org.apache.logging.log4j
+ log4j-api
test
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
index dd02f6ba2f..2ca9f69fb5 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/admin/ActiveCompaction.java
@@ -57,7 +57,7 @@ public abstract class ActiveCompaction {
* @deprecated Chop compactions no longer occur and it's not expected that
listing compaction
* would ever return this.
*/
-@Deprecated(since = "3.1")
+@Deprecated(since = "3.1.0")
CHOP,
/**
* idle compaction
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/Property.java
b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
index 61671b85f4..cd68164
(accumulo-access) branch main updated: Put benchmark config inside its execution (#79)
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-access.git The following commit(s) were added to refs/heads/main by this push: new ab05908 Put benchmark config inside its execution (#79) ab05908 is described below commit ab05908f4069620575a626c911fae514da7a48ad Author: Christopher Tubbs AuthorDate: Tue Jul 23 23:33:31 2024 -0400 Put benchmark config inside its execution (#79) * Configuration outside of the execution will apply to all executions of exec-maven-plugin when the profile is active, even executions that have nothing to do with the benchmark, so the benchmark-specific configuration should be contained inside the execution element * Remove extra character from README --- README.md | 3 ++- pom.xml | 18 +- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index 5c24fb6..4572b01 100644 --- a/README.md +++ b/README.md @@ -73,8 +73,9 @@ For an ANTLRv4 example, see antlr-example integration test's This project includes a JMH Benchmark. To run it: ``` -mvn clean verify -Pbenchmark" +mvn clean verify -Pbenchmark ``` + [1]: https://github.com/apache/accumulo/blob/rel/2.1.2/core/src/main/java/org/apache/accumulo/core/security/ColumnVisibility.java [2]: https://github.com/apache/accumulo/blob/rel/2.1.2/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java diff --git a/pom.xml b/pom.xml index 32884e9..4649a9d 100644 --- a/pom.xml +++ b/pom.xml @@ -765,21 +765,21 @@ org.codehaus.mojo exec-maven-plugin 3.3.0 - - test - java - --classpath - - org.apache.accumulo.access.AccessExpressionBenchmark - - exec verify + + test + java + +-classpath + + org.apache.accumulo.access.AccessExpressionBenchmark + +
(accumulo-testing) branch main updated: Fix trivial warnings
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-testing.git
The following commit(s) were added to refs/heads/main by this push:
new 3e78ef7 Fix trivial warnings
3e78ef7 is described below
commit 3e78ef7925fbc740f443709cebc978b8d1726d55
Author: Christopher Tubbs
AuthorDate: Tue Jul 23 13:43:33 2024 -0400
Fix trivial warnings
* Fix resource closure warning in lambda by assigning to a final var
outside
* Fix deprecation warning by suppressing the use of the deprecated
method
* Add missing serialVersionUID to Serializable anonymous inner class
---
.../org/apache/accumulo/testing/continuous/ContinuousInputFormat.java | 1 +
.../accumulo/testing/performance/tests/YieldingScanExecutorPT.java | 3 ++-
.../java/org/apache/accumulo/testing/randomwalk/shard/ExportIndex.java | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousInputFormat.java
b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousInputFormat.java
index fd3443b..a6fa97d 100644
---
a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousInputFormat.java
+++
b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousInputFormat.java
@@ -143,6 +143,7 @@ public class ContinuousInputFormat extends
InputFormat {
byte[] fam = genCol(random.nextInt(maxFam));
byte[] qual = genCol(random.nextInt(maxQual));
+@SuppressWarnings("deprecation")
byte[] cv =
visibilities.get(random.nextInt(visibilities.size())).flatten();
if (cksum != null) {
diff --git
a/src/main/java/org/apache/accumulo/testing/performance/tests/YieldingScanExecutorPT.java
b/src/main/java/org/apache/accumulo/testing/performance/tests/YieldingScanExecutorPT.java
index b6cd64e..ac5da63 100644
---
a/src/main/java/org/apache/accumulo/testing/performance/tests/YieldingScanExecutorPT.java
+++
b/src/main/java/org/apache/accumulo/testing/performance/tests/YieldingScanExecutorPT.java
@@ -220,7 +220,8 @@ public class YieldingScanExecutorPT implements
PerformanceTest {
TestExecutor longScans = new TestExecutor<>(NUM_LONG_SCANS);
for (int i = 0; i < NUM_LONG_SCANS; i++) {
- longScans.submit(() -> scan(tableName, env.getClient(), stop,
fpi.next()));
+ final var client = env.getClient();
+ longScans.submit(() -> scan(tableName, client, stop, fpi.next()));
}
return longScans;
}
diff --git
a/src/main/java/org/apache/accumulo/testing/randomwalk/shard/ExportIndex.java
b/src/main/java/org/apache/accumulo/testing/randomwalk/shard/ExportIndex.java
index 13c39f8..9460b63 100644
---
a/src/main/java/org/apache/accumulo/testing/randomwalk/shard/ExportIndex.java
+++
b/src/main/java/org/apache/accumulo/testing/randomwalk/shard/ExportIndex.java
@@ -123,6 +123,8 @@ public class ExportIndex extends Test {
private static HashMap getPropsFromTable(String tableName,
RandWalkEnv env)
throws AccumuloException, TableNotFoundException {
return new HashMap<>() {
+ private static final long serialVersionUID = 1L;
+
{
for (var entry :
env.getAccumuloClient().tableOperations().getProperties(tableName))
put(entry.getKey(), entry.getValue());
(accumulo-testing) branch main updated: Replace map reduce prop in continous ingest verify (#277)
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-testing.git
The following commit(s) were added to refs/heads/main by this push:
new 5c642ff Replace map reduce prop in continous ingest verify (#277)
5c642ff is described below
commit 5c642ff853a2b2c59dde8c539576e5b7bbac1c7b
Author: Dom G.
AuthorDate: Tue Jul 23 13:33:57 2024 -0400
Replace map reduce prop in continous ingest verify (#277)
---
.../java/org/apache/accumulo/testing/continuous/ContinuousVerify.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java
b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java
index 2f65d12..5cc5d5f 100644
--- a/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java
+++ b/src/main/java/org/apache/accumulo/testing/continuous/ContinuousVerify.java
@@ -190,7 +190,7 @@ public class ContinuousVerify extends Configured implements
Tool {
job.setOutputFormatClass(TextOutputFormat.class);
-
job.getConfiguration().setBoolean("mapred.map.tasks.speculative.execution",
scanOffline);
+ job.getConfiguration().setBoolean("mapred.map.speculative", scanOffline);
job.getConfiguration().set("mapreduce.job.classloader", "true");
Path outputPath = new Path(outputDir + "/" + job.getJobName());
(accumulo-website) branch main updated: Bump gems to avoid CVE notice
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 227a5fe82 Bump gems to avoid CVE notice 227a5fe82 is described below commit 227a5fe823ac965cc42babb79c7f0d972baaed82 Author: Christopher Tubbs AuthorDate: Mon Jul 22 16:42:36 2024 -0400 Bump gems to avoid CVE notice * Address CVE-2024-39908 by bumping rexml to 3.3.2 --- Gemfile.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 184ca7b55..fcdf0cbc9 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -56,12 +56,12 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) -rexml (3.3.1) +rexml (3.3.2) strscan rouge (4.3.0) safe_yaml (1.0.5) -sass-embedded (1.77.5-x86_64-linux-gnu) - google-protobuf (>= 3.25, < 5.0) +sass-embedded (1.77.8-x86_64-linux-gnu) + google-protobuf (~> 4.26) strscan (3.1.0) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3)
(accumulo-website) branch main updated: Line wrap source in bylaws page
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 bfb4d5916 Line wrap source in bylaws page bfb4d5916 is described below commit bfb4d59169a0c29a9ed8a7520faebe58504cf2b3 Author: Christopher Tubbs AuthorDate: Mon Jul 22 16:39:57 2024 -0400 Line wrap source in bylaws page Make amendments easier to view in the bylaws by modifying the Markdown source to wrap lines. This is a style-only change to the source to make it easier to maintain. It results in the same effectively rendered HTML. --- contributor/bylaws.md | 230 ++ 1 file changed, 175 insertions(+), 55 deletions(-) diff --git a/contributor/bylaws.md b/contributor/bylaws.md index e1ee42d82..05158cc46 100644 --- a/contributor/bylaws.md +++ b/contributor/bylaws.md @@ -5,56 +5,102 @@ redirect_from: - /governance/bylaws --- -This is version 3 of the bylaws. Community work actively continues on the bylaws, and so key segments of them are subject to change. +This is version 3 of the bylaws. Community work actively continues on the +bylaws, and so key segments of them are subject to change. # Introduction -This document defines the bylaws under which the Apache Accumulo project operates. It defines the roles and responsibilities of the project, who may vote, how voting works, how conflicts are resolved, etc. +This document defines the bylaws under which the Apache Accumulo project +operates. It defines the roles and responsibilities of the project, who may +vote, how voting works, how conflicts are resolved, etc. -Accumulo is a project of the [Apache Software Foundation][foundation]. The foundation holds the copyright on Apache code including the code in the Accumulo codebase. The [foundation FAQ][foundation-faq] explains the operation and background of the foundation. +Accumulo is a project of the [Apache Software Foundation][foundation]. The +foundation holds the copyright on Apache code including the code in the +Accumulo codebase. The [foundation FAQ][foundation-faq] explains the operation +and background of the foundation. -Accumulo is typical of Apache projects in that it operates under a set of principles, known collectively as the Apache Way. If you are new to Apache development, please refer to the [Incubator project][incubator] for more information on how Apache projects operate. Terms used at the ASF are defined in the [ASF glossary][glossary]. +Accumulo is typical of Apache projects in that it operates under a set of +principles, known collectively as the Apache Way. If you are new to Apache +development, please refer to the [Incubator project][incubator] for more +information on how Apache projects operate. Terms used at the ASF are defined +in the [ASF glossary][glossary]. # Roles and Responsibilities -Apache projects define a set of roles with associated rights and responsibilities. These roles govern what tasks an individual may perform within the project. The roles are defined in the following sections. +Apache projects define a set of roles with associated rights and +responsibilities. These roles govern what tasks an individual may perform +within the project. The roles are defined in the following sections. ## Users -The most important participants in the project are people who use our software. The majority of our contributors start out as users and guide their development efforts from the user's perspective. +The most important participants in the project are people who use our software. +The majority of our contributors start out as users and guide their development +efforts from the user's perspective. -Users contribute to the Apache projects by providing feedback to contributors in the form of bug reports and feature suggestions. As well, users participate in the Apache community by helping other users on mailing lists and user support forums. +Users contribute to the Apache projects by providing feedback to contributors +in the form of bug reports and feature suggestions. As well, users participate +in the Apache community by helping other users on mailing lists and user +support forums. ## Contributors -All of the volunteers who are contributing time, code, documentation, or resources to the Accumulo project are considered contributors. A contributor that makes sustained, welcome contributions to the project may be invited to become a committer, though the exact timing of such invitations depends on many factors. +All of the volunteers who are contributing time, code, documentation, or +resources to the Accumulo project are considered contributors. A contributor +that makes sustained, welcome contributions to the project may be invited to +become a committer, though the exact timing of such i
(accumulo-website) branch main updated: Move John Vines to PMC Emeritus as requested
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 d96753e50 Move John Vines to PMC Emeritus as requested
d96753e50 is described below
commit d96753e500190df9d65001369a36f65c0a275c72
Author: Christopher Tubbs
AuthorDate: Mon Jul 22 15:59:35 2024 -0400
Move John Vines to PMC Emeritus as requested
---
pages/people.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pages/people.md b/pages/people.md
index c76fc792a..7cf097185 100644
--- a/pages/people.md
+++ b/pages/people.md
@@ -57,7 +57,6 @@ $(function() {
| shutchis | Shana Hutchison |
[University of Washington][UW] | [PT][PT] |
| ujustgotbilld | William Slacum| [Miner
& Kasch][MINERKASCH]| [ET][ET] |
| vikrams | Vikram Srivastava |
[Cloudera][CLOUDERA] | [PT][PT] |
-| vines | John Vines|
[sqrrl][SQRRL] | [ET][ET] |
## Committers Only (PMC Emeritus)
@@ -67,6 +66,7 @@ $(function() {
| arvindsh | Arvind Shyamsundar|
[Microsoft][MICROSOFT] | [PT][PT] |
| knarendran| Karthick Narendran|
[Microsoft][MICROSOFT] |[BST][BST]|
| medined | David Medinets|
| |
+| vines | John Vines|
[sqrrl][SQRRL] | [ET][ET] |
## Contributors
(accumulo-website) branch main updated: Stop dropdown menu from being cut off (#430)
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 25a97621 Stop dropdown menu from being cut off (#430) 25a97621 is described below commit 25a9762124b1495665a7f4684b8bb413b71dc9ac Author: Dom G. AuthorDate: Sun Jul 21 20:04:12 2024 -0400 Stop dropdown menu from being cut off (#430) --- _includes/nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/nav.html b/_includes/nav.html index 3c10fc71..b91ca14e 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -49,7 +49,7 @@ https://www.apache.org/foundation/press/kit/feather.svg"; width="15"/> - + https://www.apache.org";>Apache Homepage https://www.apache.org/licenses/";>License https://www.apache.org/foundation/sponsorship";>Sponsorship
(accumulo) branch main updated (8ed6dbad90 -> 1f7c2c2f42)
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 8ed6dbad90 Merge branch '2.1' add a7167daa8f Clean up the 2.1 build a bit (#4743) new 1f7c2c2f42 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: assemble/pom.xml | 5 -- core/pom.xml | 30 .../hadoopImpl/mapred/AccumuloRecordReader.java| 4 +- .../hadoopImpl/mapreduce/AccumuloRecordReader.java | 4 +- minicluster/pom.xml| 5 -- pom.xml| 11 +-- .../accumulo/server/metrics/MetricsInfoImpl.java | 4 +- .../accumulo/server/util/ServiceStatusCmd.java | 14 ++-- .../server/metrics/MetricsInfoImplTest.java| 4 +- server/compaction-coordinator/pom.xml | 4 - server/compactor/pom.xml | 4 - .../src/test/resources/conf/generic_logger.xml | 87 -- .../src/test/resources/conf/monitor_logger.xml | 68 - server/monitor/pom.xml | 2 +- start/pom.xml | 1 + .../apache/accumulo/test/ClientSideIteratorIT.java | 13 ++-- .../java/org/apache/accumulo/test/PrintInfoIT.java | 4 - 17 files changed, 41 insertions(+), 223 deletions(-) delete mode 100644 server/manager/src/test/resources/conf/generic_logger.xml delete mode 100644 server/manager/src/test/resources/conf/monitor_logger.xml
(accumulo) branch elasticity updated (cbbc4adaf9 -> 8b57e322d9)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git from cbbc4adaf9 Merge branch 'main' into elasticity add a7167daa8f Clean up the 2.1 build a bit (#4743) new 1f7c2c2f42 Merge branch '2.1' new 8b57e322d9 Merge branch 'main' into elasticity 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. Summary of changes: assemble/pom.xml | 5 -- core/pom.xml | 30 .../hadoopImpl/mapred/AccumuloRecordReader.java| 4 +- .../hadoopImpl/mapreduce/AccumuloRecordReader.java | 4 +- minicluster/pom.xml| 5 -- pom.xml| 11 +-- .../accumulo/server/metrics/MetricsInfoImpl.java | 4 +- .../accumulo/server/util/ServiceStatusCmd.java | 14 ++-- .../server/metrics/MetricsInfoImplTest.java| 4 +- server/compactor/pom.xml | 4 - .../src/test/resources/conf/generic_logger.xml | 87 -- .../src/test/resources/conf/monitor_logger.xml | 68 - server/monitor/pom.xml | 2 +- start/pom.xml | 1 + .../apache/accumulo/test/ClientSideIteratorIT.java | 13 ++-- .../java/org/apache/accumulo/test/PrintInfoIT.java | 4 - 16 files changed, 41 insertions(+), 219 deletions(-) delete mode 100644 server/manager/src/test/resources/conf/generic_logger.xml delete mode 100644 server/manager/src/test/resources/conf/monitor_logger.xml
(accumulo) 02/02: Merge branch 'main' into elasticity
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch elasticity in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 8b57e322d94194815e6df32bac73aa627d3bd8ae Merge: cbbc4adaf9 1f7c2c2f42 Author: Christopher Tubbs AuthorDate: Thu Jul 18 15:52:30 2024 -0400 Merge branch 'main' into elasticity assemble/pom.xml | 5 -- core/pom.xml | 30 .../hadoopImpl/mapred/AccumuloRecordReader.java| 4 +- .../hadoopImpl/mapreduce/AccumuloRecordReader.java | 4 +- minicluster/pom.xml| 5 -- pom.xml| 11 +-- .../accumulo/server/metrics/MetricsInfoImpl.java | 4 +- .../accumulo/server/util/ServiceStatusCmd.java | 14 ++-- .../server/metrics/MetricsInfoImplTest.java| 4 +- server/compactor/pom.xml | 4 - .../src/test/resources/conf/generic_logger.xml | 87 -- .../src/test/resources/conf/monitor_logger.xml | 68 - server/monitor/pom.xml | 2 +- start/pom.xml | 1 + .../apache/accumulo/test/ClientSideIteratorIT.java | 13 ++-- .../java/org/apache/accumulo/test/PrintInfoIT.java | 4 - 16 files changed, 41 insertions(+), 219 deletions(-)
(accumulo) 01/02: Merge branch '2.1'
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch elasticity
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 1f7c2c2f42e54d5e41d15e92d055f57e39c87932
Merge: 8ed6dbad90 a7167daa8f
Author: Christopher Tubbs
AuthorDate: Thu Jul 18 15:43:03 2024 -0400
Merge branch '2.1'
assemble/pom.xml | 5 --
core/pom.xml | 30
.../hadoopImpl/mapred/AccumuloRecordReader.java| 4 +-
.../hadoopImpl/mapreduce/AccumuloRecordReader.java | 4 +-
minicluster/pom.xml| 5 --
pom.xml| 11 +--
.../accumulo/server/metrics/MetricsInfoImpl.java | 4 +-
.../accumulo/server/util/ServiceStatusCmd.java | 14 ++--
.../server/metrics/MetricsInfoImplTest.java| 4 +-
server/compaction-coordinator/pom.xml | 4 -
server/compactor/pom.xml | 4 -
.../src/test/resources/conf/generic_logger.xml | 87 --
.../src/test/resources/conf/monitor_logger.xml | 68 -
server/monitor/pom.xml | 2 +-
start/pom.xml | 1 +
.../apache/accumulo/test/ClientSideIteratorIT.java | 13 ++--
.../java/org/apache/accumulo/test/PrintInfoIT.java | 4 -
17 files changed, 41 insertions(+), 223 deletions(-)
diff --cc pom.xml
index ca8db04a0d,16de14b163..ebd4c0e8ff
--- a/pom.xml
+++ b/pom.xml
@@@ -314,12 -319,13 +314,12 @@@
commons-logging
commons-logging
- 1.2
+ 1.3.3
-
-junit
-junit
-4.13.2
+org.apache.accumulo
+accumulo-access
+${version.accumulo-access}
org.apache.accumulo
diff --cc
server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
index b042fcf838,557c789141..2a829499a8
---
a/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
+++
b/server/base/src/main/java/org/apache/accumulo/server/util/ServiceStatusCmd.java
@@@ -229,9 -242,9 +229,9 @@@ public class ServiceStatusCmd
Map> hostsByGroups = new TreeMap<>();
// get group names
- Result> queueNodes = readNodeNames(zooReader,
zRootPath);
+ Result> queueNodes = readNodeNames(zooReader, zRootPath);
errors.addAndGet(queueNodes.getErrorCount());
-Set queues = new TreeSet<>(queueNodes.getHosts());
+Set queues = new TreeSet<>(queueNodes.getData());
queues.forEach(group -> {
var hostNames = readNodeNames(zooReader, zRootPath + "/" + group);
@@@ -298,8 -311,8 +298,8 @@@
* @return Pair with error count, the data from each node as a String.
*/
@VisibleForTesting
- Result> readAllNodesData(final ZooReader zooReader,
final String path) {
+ Result> readAllNodesData(final ZooReader zooReader, final
String path) {
-Set hosts = new TreeSet<>();
+Set data = new TreeSet<>();
final AtomicInteger errorCount = new AtomicInteger(0);
try {
var locks = zooReader.getChildren(path);
diff --cc server/manager/src/test/resources/conf/generic_logger.xml
index bb51e5fe5e,bb51e5fe5e..00
deleted file mode 100644,100644
--- a/server/manager/src/test/resources/conf/generic_logger.xml
+++ /dev/null
@@@ -1,87 -1,87 +1,0 @@@
--
--
--
--http://jakarta.apache.org/log4j/";>
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
diff --cc server/manager/src/test/resources/conf/monitor_logger.xml
index 1b24900110,1b24900110..00
deleted file mode 100644,100644
--- a/server/manager/src/test/resources/conf/monitor_logger.xml
+++ /dev/null
@@@ -1,68 -1,68 +1,0 @@@
--
--
--
--http://jakarta.apache.org/log4j/";>
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
(accumulo) branch 2.1 updated: Clean up the 2.1 build a bit (#4743)
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 a7167daa8f Clean up the 2.1 build a bit (#4743) a7167daa8f is described below commit a7167daa8f25f3a6089ef382548fa2a107c4cc53 Author: Christopher Tubbs AuthorDate: Thu Jul 18 15:18:49 2024 -0400 Clean up the 2.1 build a bit (#4743) * Bump commons-logging to 1.3, so it natively supports sending logs to slf4j or log4j without the log4j-jcl bridge See https://github.com/apache/commons-logging/pull/177 * Fix issue described in https://github.com/apache/accumulo/pull/4558#issuecomment-2231991529 regarding log4j-api being required for log4j-1.2-api in core/pom.xml by making sure bnd and log4j-api are in the compile scope but marked as provided to avoid the maven-dependency-plugin from complaining because they appear to be required only for the test, but actually are still needed transitively for log4j-1.2-api * Fix some false-positive Closeable resource warnings from wrapping a Scanner with an IsolatedScanner * Suppress some deprecation warnings for scan server metadata schema * Remove log4j-1.2-api from minicluster and compactor modules, where they weren't used * Fix some incorrect `@SuppressWarnings` comments * Fix generics with the ServiceStatusCmd's Result class, which had a generic `A extends Integer` parameter, but `Integer` is final and cannot be extended * Remove some unused variables * Add a few comments in the POMs to explain why some log4j dependencies exist where they do * Add a try-with-resources block in ClientSideIteratorIT to ensure the scanner is closed when done * Remove an unneeded exclusion on httpclient from libthrift (it's not a transitive dependency in the POM for the version of libthrift we are using, and upstream they have already migrated to newer versions of httpclient5 in the latest POM for libthrift) --- assemble/pom.xml | 5 core/pom.xml | 30 ++ .../core/client/mapred/AbstractInputFormat.java| 4 ++- .../core/client/mapreduce/AbstractInputFormat.java | 4 ++- .../core/metadata/ScanServerRefTabletFile.java | 5 ++-- .../hadoopImpl/mapred/AccumuloRecordReader.java| 4 ++- .../hadoopImpl/mapreduce/AccumuloRecordReader.java | 4 ++- minicluster/pom.xml| 5 pom.xml| 11 ++-- .../accumulo/server/metadata/ServerAmpleImpl.java | 4 +-- .../accumulo/server/metrics/MetricsInfoImpl.java | 4 +-- .../accumulo/server/util/ServiceStatusCmd.java | 14 +- .../server/metrics/MetricsInfoImplTest.java| 4 +-- server/compaction-coordinator/pom.xml | 4 --- server/compactor/pom.xml | 4 --- .../accumulo/manager/metrics/ManagerMetrics.java | 4 --- server/monitor/pom.xml | 2 +- start/pom.xml | 1 + .../apache/accumulo/test/ClientSideIteratorIT.java | 13 +- .../java/org/apache/accumulo/test/PrintInfoIT.java | 4 --- .../test/ScanServerMetadataEntriesCleanIT.java | 7 ++--- 21 files changed, 56 insertions(+), 81 deletions(-) diff --git a/assemble/pom.xml b/assemble/pom.xml index 78658c3e05..d24a608120 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -302,11 +302,6 @@ log4j-core true - - org.apache.logging.log4j - log4j-jcl - true - org.apache.logging.log4j log4j-jul diff --git a/core/pom.xml b/core/pom.xml index 57c8c425b4..9822afe1b8 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -114,18 +114,13 @@ hadoop-client-api + org.apache.logging.log4j log4j-1.2-api org.apache.thrift libthrift - - - org.apache.httpcomponents - httpcore - - org.apache.zookeeper @@ -148,24 +143,25 @@ snakeyaml - org.apache.hadoop - hadoop-client-runtime - runtime - - - + biz.aQute.bnd biz.aQute.bnd.annotation - test + provided + + + + org.apache.logging.log4j + log4j-api + provided org.apache.hadoop - hadoop-client-minicluster - test + hadoop-client-runtime + runtime - org.apache.logging.log4j - log4j-api + org.apache.hadoop + hadoop-client-minicluster test diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java b/core/src/main/java/org/
(accumulo-website) branch main updated: Update link to external compaction project
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 912b1b47 Update link to external compaction project 912b1b47 is described below commit 912b1b47716ba2a65b1992717df541942abd7462 Author: Christopher Tubbs AuthorDate: Fri Jul 12 02:28:42 2024 -0400 Update link to external compaction project --- _posts/release/2022-11-01-accumulo-2.1.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/release/2022-11-01-accumulo-2.1.0.md b/_posts/release/2022-11-01-accumulo-2.1.0.md index 130df5ce..6227e2f9 100644 --- a/_posts/release/2022-11-01-accumulo-2.1.0.md +++ b/_posts/release/2022-11-01-accumulo-2.1.0.md @@ -430,7 +430,7 @@ released after 2.0.0 and 2.0.1. [upgrade]: /docs/2.x/administration/upgrading [milestone]: https://github.com/apache/accumulo/milestone/14 [ext_comp_blog]: /blog/2021/07/08/external-compactions.html -[ext_comp_project]: https://github.com/apache/accumulo/projects/20 +[ext_comp_project]: https://github.com/orgs/apache/projects/372 [vfs_system_classloader]: https://github.com/apache/accumulo-classloaders/tree/main/modules/vfs-class-loader [opentelemetry_home]: https://opentelemetry.io/ [micrometer_home]: https://micrometer.io/
(accumulo-website) 02/02: Update links to milestones
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
commit 6d7b8007ff3576f7307b900ced401ac052583302
Author: Christopher Tubbs
AuthorDate: Fri Jul 12 00:46:29 2024 -0400
Update links to milestones
* Update links from classic projects to milestones
* Add some additional details to release notes for certain special case
issues
---
_posts/release/2018-04-18-accumulo-1.9.0.md | 2 +-
_posts/release/2018-05-14-accumulo-1.9.1.md | 2 +-
_posts/release/2018-07-19-accumulo-1.9.2.md | 2 +-
_posts/release/2019-04-10-accumulo-1.9.3.md | 2 +-
_posts/release/2019-08-02-accumulo-2.0.0.md | 2 +-
_posts/release/2020-09-03-accumulo-1.10.0.md | 2 +-
_posts/release/2020-12-22-accumulo-1.10.1.md | 2 +-
_posts/release/2020-12-24-accumulo-2.0.1.md | 2 +-
_posts/release/2022-02-13-accumulo-1.10.2.md | 2 +-
_posts/release/2022-11-01-accumulo-2.1.0.md | 4 ++--
_posts/release/2023-04-13-accumulo-1.10.3.md | 2 +-
_posts/release/2023-06-19-accumulo-2.1.1.md | 5 +++--
_posts/release/2023-08-21-accumulo-2.1.2.md | 2 +-
_posts/release/2023-08-21-accumulo-3.0.0.md | 2 +-
_posts/release/2023-11-16-accumulo-1.10.4.md | 2 +-
_posts/release/2024-07-10-accumulo-2.1.3.md | 2 +-
16 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/_posts/release/2018-04-18-accumulo-1.9.0.md
b/_posts/release/2018-04-18-accumulo-1.9.0.md
index 706eb0e1..e820a9c2 100644
--- a/_posts/release/2018-04-18-accumulo-1.9.0.md
+++ b/_posts/release/2018-04-18-accumulo-1.9.0.md
@@ -116,7 +116,7 @@ nodes for 24 hours followed by a successful verification.
* [All tickets on JIRA related to this release][JIRA]
-[milestone]: https://github.com/apache/accumulo/projects/4
+[milestone]: https://github.com/apache/accumulo/milestone/3
[JIRA]:
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312121&version=12339245
[upgrade]: {{ site.baseurl }}/docs/2.x/administration/upgrading
[user_manual]: {{ site.baseurl }}/1.9/accumulo_user_manual.html
diff --git a/_posts/release/2018-05-14-accumulo-1.9.1.md
b/_posts/release/2018-05-14-accumulo-1.9.1.md
index d8778f44..5c8e2737 100644
--- a/_posts/release/2018-05-14-accumulo-1.9.1.md
+++ b/_posts/release/2018-05-14-accumulo-1.9.1.md
@@ -58,7 +58,7 @@ successful verification. The integration tests were run
against both Hadoop
[#443]: https://github.com/apache/accumulo/issues/443
[#449]: https://github.com/apache/accumulo/issues/449
[#458]: https://github.com/apache/accumulo/issues/458
-[milestone]: https://github.com/apache/accumulo/projects/5
+[milestone]: https://github.com/apache/accumulo/milestone/4
[examples]: {{ site.baseurl }}/1.9/examples/
[javadoc]: {{ site.baseurl }}/1.9/apidocs/
[upgrade]: {{ site.baseurl }}/docs/2.x/administration/upgrading
diff --git a/_posts/release/2018-07-19-accumulo-1.9.2.md
b/_posts/release/2018-07-19-accumulo-1.9.2.md
index 139994f3..52d1f8e3 100644
--- a/_posts/release/2018-07-19-accumulo-1.9.2.md
+++ b/_posts/release/2018-07-19-accumulo-1.9.2.md
@@ -91,7 +91,7 @@ View the [Upgrading Accumulo documentation][upgrade] for
guidance.
[#546]: https://github.com/apache/accumulo/issues/546
[#553]: https://github.com/apache/accumulo/issues/553
[#559]: https://github.com/apache/accumulo/issues/559
-[milestone]: https://github.com/apache/accumulo/projects/6
+[milestone]: https://github.com/apache/accumulo/milestone/5
[Uno]: https://github.com/apache/fluo-uno
[examples]: {{ site.baseurl }}/1.9/examples/
[fluo]: https://fluo.apache.org
diff --git a/_posts/release/2019-04-10-accumulo-1.9.3.md
b/_posts/release/2019-04-10-accumulo-1.9.3.md
index 37f59e21..351cfc43 100644
--- a/_posts/release/2019-04-10-accumulo-1.9.3.md
+++ b/_posts/release/2019-04-10-accumulo-1.9.3.md
@@ -213,7 +213,7 @@ View the [Upgrading Accumulo documentation][upgrade] for
guidance.
[#1055]: https://github.com/apache/accumulo/issues/1055
[#1057]: https://github.com/apache/accumulo/issues/1057
[all-changes]:
https://github.com/apache/accumulo/compare/rel/1.9.2...apache:rel/1.9.3
-[milestone]: https://github.com/apache/accumulo/projects/7
+[milestone]: https://github.com/apache/accumulo/milestone/6
[Uno]: https://github.com/apache/fluo-uno
[examples]: {{ site.baseurl }}/1.9/examples/
[fluo]: https://fluo.apache.org
diff --git a/_posts/release/2019-08-02-accumulo-2.0.0.md
b/_posts/release/2019-08-02-accumulo-2.0.0.md
index 05347d14..44a905df 100644
--- a/_posts/release/2019-08-02-accumulo-2.0.0.md
+++ b/_posts/release/2019-08-02-accumulo-2.0.0.md
@@ -208,7 +208,7 @@ View the [Upgrading Accumulo documentation][upgrade] for
guidance.
* [All tickets on GitHub related to this release][milestone]
-[milestone]: https://github.com/apache/accumulo/projects/9
+[milestone]: https://github.com/apache/accumulo/milestone/12
[#634]: https://github.com/apache/accumulo/issues/634
[ACCUMULO-3652]: https://issues.apache
(accumulo-website) branch main updated (05cd565a -> 6d7b8007)
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-website.git from 05cd565a Standardize links to release milestones new a0e68638 Remove period on bullet points for milestones new 6d7b8007 Update links to milestones 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. Summary of changes: _posts/release/2018-04-18-accumulo-1.9.0.md | 6 +++--- _posts/release/2018-05-14-accumulo-1.9.1.md | 4 ++-- _posts/release/2018-07-19-accumulo-1.9.2.md | 4 ++-- _posts/release/2019-04-10-accumulo-1.9.3.md | 4 ++-- _posts/release/2019-08-02-accumulo-2.0.0.md | 4 ++-- _posts/release/2020-09-03-accumulo-1.10.0.md | 4 ++-- _posts/release/2020-12-22-accumulo-1.10.1.md | 4 ++-- _posts/release/2020-12-24-accumulo-2.0.1.md | 4 ++-- _posts/release/2022-02-13-accumulo-1.10.2.md | 4 ++-- _posts/release/2022-11-01-accumulo-2.1.0.md | 6 +++--- _posts/release/2023-04-13-accumulo-1.10.3.md | 4 ++-- _posts/release/2023-06-19-accumulo-2.1.1.md | 7 --- _posts/release/2023-08-21-accumulo-2.1.2.md | 4 ++-- _posts/release/2023-08-21-accumulo-3.0.0.md | 4 ++-- _posts/release/2023-11-16-accumulo-1.10.4.md | 4 ++-- _posts/release/2024-07-10-accumulo-2.1.3.md | 4 ++-- 16 files changed, 36 insertions(+), 35 deletions(-)
(accumulo-website) 01/02: Remove period on bullet points for milestones
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 commit a0e68638294a66c6665fdec2c01cae776139fbd5 Author: Christopher Tubbs AuthorDate: Thu Jul 11 19:42:28 2024 -0400 Remove period on bullet points for milestones --- _posts/release/2018-04-18-accumulo-1.9.0.md | 4 ++-- _posts/release/2018-05-14-accumulo-1.9.1.md | 2 +- _posts/release/2018-07-19-accumulo-1.9.2.md | 2 +- _posts/release/2019-04-10-accumulo-1.9.3.md | 2 +- _posts/release/2019-08-02-accumulo-2.0.0.md | 2 +- _posts/release/2020-09-03-accumulo-1.10.0.md | 2 +- _posts/release/2020-12-22-accumulo-1.10.1.md | 2 +- _posts/release/2020-12-24-accumulo-2.0.1.md | 2 +- _posts/release/2022-02-13-accumulo-1.10.2.md | 2 +- _posts/release/2022-11-01-accumulo-2.1.0.md | 2 +- _posts/release/2023-04-13-accumulo-1.10.3.md | 2 +- _posts/release/2023-06-19-accumulo-2.1.1.md | 2 +- _posts/release/2023-08-21-accumulo-2.1.2.md | 2 +- _posts/release/2023-08-21-accumulo-3.0.0.md | 2 +- _posts/release/2023-11-16-accumulo-1.10.4.md | 2 +- _posts/release/2024-07-10-accumulo-2.1.3.md | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/_posts/release/2018-04-18-accumulo-1.9.0.md b/_posts/release/2018-04-18-accumulo-1.9.0.md index 50090b8f..706eb0e1 100644 --- a/_posts/release/2018-04-18-accumulo-1.9.0.md +++ b/_posts/release/2018-04-18-accumulo-1.9.0.md @@ -112,8 +112,8 @@ nodes for 24 hours followed by a successful verification. ## Useful Links -* [All tickets on GitHub related to this release.][milestone] -* [All tickets on JIRA related to this release.][JIRA] +* [All tickets on GitHub related to this release][milestone] +* [All tickets on JIRA related to this release][JIRA] [milestone]: https://github.com/apache/accumulo/projects/4 diff --git a/_posts/release/2018-05-14-accumulo-1.9.1.md b/_posts/release/2018-05-14-accumulo-1.9.1.md index 8f9b69e2..d8778f44 100644 --- a/_posts/release/2018-05-14-accumulo-1.9.1.md +++ b/_posts/release/2018-05-14-accumulo-1.9.1.md @@ -50,7 +50,7 @@ successful verification. The integration tests were run against both Hadoop ## Useful Links -* [All tickets related to this release.][milestone] +* [All tickets related to this release][milestone] [#432]: https://github.com/apache/accumulo/issues/432 diff --git a/_posts/release/2018-07-19-accumulo-1.9.2.md b/_posts/release/2018-07-19-accumulo-1.9.2.md index ac46dd61..139994f3 100644 --- a/_posts/release/2018-07-19-accumulo-1.9.2.md +++ b/_posts/release/2018-07-19-accumulo-1.9.2.md @@ -80,7 +80,7 @@ View the [Upgrading Accumulo documentation][upgrade] for guidance. ## Useful Links -* [All tickets related to this release.][milestone] +* [All tickets related to this release][milestone] [#441]: https://github.com/apache/accumulo/issues/441 diff --git a/_posts/release/2019-04-10-accumulo-1.9.3.md b/_posts/release/2019-04-10-accumulo-1.9.3.md index 11fb88bc..37f59e21 100644 --- a/_posts/release/2019-04-10-accumulo-1.9.3.md +++ b/_posts/release/2019-04-10-accumulo-1.9.3.md @@ -146,7 +146,7 @@ View the [Upgrading Accumulo documentation][upgrade] for guidance. * [Release VOTE email thread][vote-emails] * [All Changes since 1.9.2][all-changes] -* [All tickets related to this release.][milestone] +* [All tickets related to this release][milestone] [#559]: https://github.com/apache/accumulo/issues/559 diff --git a/_posts/release/2019-08-02-accumulo-2.0.0.md b/_posts/release/2019-08-02-accumulo-2.0.0.md index b82503ba..05347d14 100644 --- a/_posts/release/2019-08-02-accumulo-2.0.0.md +++ b/_posts/release/2019-08-02-accumulo-2.0.0.md @@ -205,7 +205,7 @@ View the [Upgrading Accumulo documentation][upgrade] for guidance. ## Useful Links -* [All tickets on GitHub related to this release.][milestone] +* [All tickets on GitHub related to this release][milestone] [milestone]: https://github.com/apache/accumulo/projects/9 diff --git a/_posts/release/2020-09-03-accumulo-1.10.0.md b/_posts/release/2020-09-03-accumulo-1.10.0.md index 35569b92..0cb31911 100644 --- a/_posts/release/2020-09-03-accumulo-1.10.0.md +++ b/_posts/release/2020-09-03-accumulo-1.10.0.md @@ -179,7 +179,7 @@ properly. * [Release VOTE email thread][vote-emails] * [All Changes since 1.9.3][all-changes] -* [All tickets related to this release.][milestone] +* [All tickets related to this release][milestone] [milestone]: https://github.com/apache/accumulo/projects/8 diff --git a/_posts/release/2020-12-22-accumulo-1.10.1.md b/_posts/release/2020-12-22-accumulo-1.10.1.md index f7d6de66..cfb8adc2 100644 --- a/_posts/release/2020-12-22-accumulo-1.10.1.md +++ b/_posts/release/2020-12-22-accumulo-1.10.1.md @@ -54,7 +54,7 @@ with `-Denforcer.skip`, as a workaround. * [Release VOTE email thread][vote-emails] * [All Changes since 1.10.0][all-changes] -* [All tickets related to this release.][milestone
(accumulo-website) branch main updated: Standardize links to release milestones
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 05cd565a Standardize links to release milestones
05cd565a is described below
commit 05cd565a279c8d07c53c52169a8a9cfa323e1898
Author: Christopher Tubbs
AuthorDate: Thu Jul 11 19:00:30 2024 -0400
Standardize links to release milestones
For versions 1.9.0 and later, where GitHub projects were used to track
issues for a release milestone, update the release notes to standardize
how the links are presented, so they can be easily changed to milestones
after GitHub is updated to use milestones instead of projects for
version planning. See mailing list discussion about GitHub classic
projects sunsetting:
https://lists.apache.org/thread/x52hpy64jmbkwoq8lx8hw5h9yjozo78q
---
_posts/release/2018-04-18-accumulo-1.9.0.md | 10 --
_posts/release/2018-05-14-accumulo-1.9.1.md | 11 ++-
_posts/release/2018-07-19-accumulo-1.9.2.md | 11 ++-
_posts/release/2018-10-14-accumulo-2.0.0-alpha-1.md | 2 ++
_posts/release/2019-04-10-accumulo-1.9.3.md | 11 ++-
_posts/release/2019-08-02-accumulo-2.0.0.md | 8
_posts/release/2020-09-03-accumulo-1.10.0.md| 5 +++--
_posts/release/2020-12-22-accumulo-1.10.1.md| 5 +++--
_posts/release/2020-12-24-accumulo-2.0.1.md | 7 +--
_posts/release/2022-02-13-accumulo-1.10.2.md| 5 +++--
_posts/release/2022-11-01-accumulo-2.1.0.md | 13 -
_posts/release/2023-04-13-accumulo-1.10.3.md| 5 +++--
_posts/release/2023-06-19-accumulo-2.1.1.md | 9 ++---
_posts/release/2023-08-21-accumulo-2.1.2.md | 6 +++---
_posts/release/2023-08-21-accumulo-3.0.0.md | 8 +---
_posts/release/2023-11-16-accumulo-1.10.4.md| 5 +++--
_posts/release/2024-07-10-accumulo-2.1.3.md | 8 +---
17 files changed, 83 insertions(+), 46 deletions(-)
diff --git a/_posts/release/2018-04-18-accumulo-1.9.0.md
b/_posts/release/2018-04-18-accumulo-1.9.0.md
index 11d518d0..50090b8f 100644
--- a/_posts/release/2018-04-18-accumulo-1.9.0.md
+++ b/_posts/release/2018-04-18-accumulo-1.9.0.md
@@ -9,7 +9,7 @@ be considered a maintenance release on 1.8 branch except there
are some API
additions which resulted in a new minor release. Users of 1.8.x versions of
Accumulo should upgrade to 1.9.0. There will be no more bug fix releases on the
1.8 branch. This release contains changes for nearly a hundred issues. See
-[GitHub] and [JIRA] for a list of changes.
+[GitHub][milestone] and [JIRA] for a list of changes.
Below are resources for this release:
@@ -110,7 +110,13 @@ Continuous ingest, random walk, and all integration test
were run against RC1.
Randomwalk was run for 2 days with 7 walkers. Continuous ingest was run with 9
nodes for 24 hours followed by a successful verification.
-[GitHub]:
https://github.com/apache/accumulo/issues?q=project%3Aapache%2Faccumulo%2F4
+## Useful Links
+
+* [All tickets on GitHub related to this release.][milestone]
+* [All tickets on JIRA related to this release.][JIRA]
+
+
+[milestone]: https://github.com/apache/accumulo/projects/4
[JIRA]:
https://issues.apache.org/jira/secure/ReleaseNote.jspa?projectId=12312121&version=12339245
[upgrade]: {{ site.baseurl }}/docs/2.x/administration/upgrading
[user_manual]: {{ site.baseurl }}/1.9/accumulo_user_manual.html
diff --git a/_posts/release/2018-05-14-accumulo-1.9.1.md
b/_posts/release/2018-05-14-accumulo-1.9.1.md
index ca785a0e..8f9b69e2 100644
--- a/_posts/release/2018-05-14-accumulo-1.9.1.md
+++ b/_posts/release/2018-05-14-accumulo-1.9.1.md
@@ -37,10 +37,6 @@ A less serious bug than the above critical bugs was
discovered and fixed,
pertaining to write-ahead log recovery. This bug involved recovery files not
being removed properly when no longer required and was fixed in [#432].
-## Other Changes
-
-* [GitHub] - List of issues tracked on GitHub corresponding to this release
-
## Upgrading
View the [Upgrading Accumulo documentation][upgrade] for guidance.
@@ -52,12 +48,17 @@ version. Continuous ingest was run with 9 nodes for 24
hours followed by a
successful verification. The integration tests were run against both Hadoop
2.6.4 and Hadoop 3.0.0.
+## Useful Links
+
+* [All tickets related to this release.][milestone]
+
+
[#432]: https://github.com/apache/accumulo/issues/432
[#441]: https://github.com/apache/accumulo/issues/441
[#443]: https://github.com/apache/accumulo/issues/443
[#449]: https://github.com/apache/accumulo/issues/449
[#458]: https://github.com/apache/accumulo/issues/458
-[GitHub]:
https://github.com/apache/accumulo/issues?q=project%3Aapache%2Faccumulo%2F5
+[milestone]: https://github.com/apache/accumulo/projec
(accumulo-website) branch main updated: Fix release dates on website
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 9c8ba5d8 Fix release dates on website 9c8ba5d8 is described below commit 9c8ba5d8d967e951dfad685708c8ff990e2aae6b Author: Christopher Tubbs AuthorDate: Thu Jul 11 16:36:22 2024 -0400 Fix release dates on website * Fix dates in release notes to match release dates * Fix dates in doap to match reporter.apache.org (dates are UTC+) * Fix 1.5.2 release year in release notes filename * Add doap for accumulo-access subproject * Reorder doap releases to match reporter.apache.org and chronological ordering of releases * Update gems * Rename draft notes with more recent date for 2.1.3 --- Gemfile.lock | 18 ++--- ...umulo-1.5.2.md => 2014-09-19-accumulo-1.5.2.md} | 0 ...umulo-1.6.6.md => 2016-09-19-accumulo-1.6.6.md} | 0 ...umulo-1.8.1.md => 2017-02-27-accumulo-1.8.1.md} | 0 ...umulo-1.7.3.md => 2017-03-26-accumulo-1.7.3.md} | 0 ...umulo-1.9.0.md => 2018-04-18-accumulo-1.9.0.md} | 0 ...umulo-2.1.3.md => 2024-07-10-accumulo-2.1.3.md} | 0 doap/accumulo-access.rdf | 53 doap/accumulo.rdf | 94 +++--- 9 files changed, 109 insertions(+), 56 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 007ccd00..184ca7b5 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,18 +1,18 @@ GEM remote: https://rubygems.org/ specs: -addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) +addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) bigdecimal (3.1.8) colorator (1.1.0) -concurrent-ruby (1.3.1) +concurrent-ruby (1.3.3) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) ffi (1.17.0-x86_64-linux-gnu) forwardable-extended (2.6.0) -google-protobuf (4.27.0-x86_64-linux) +google-protobuf (4.27.2-x86_64-linux) bigdecimal rake (>= 13) http_parser.rb (0.8.0) @@ -51,16 +51,16 @@ GEM mercenary (0.4.0) pathutil (0.16.2) forwardable-extended (~> 2.6) -public_suffix (5.0.5) +public_suffix (6.0.0) rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) -rexml (3.2.8) - strscan (>= 3.0.9) -rouge (4.2.1) +rexml (3.3.1) + strscan +rouge (4.3.0) safe_yaml (1.0.5) -sass-embedded (1.77.4-x86_64-linux-gnu) +sass-embedded (1.77.5-x86_64-linux-gnu) google-protobuf (>= 3.25, < 5.0) strscan (3.1.0) terminal-table (3.0.2) diff --git a/_posts/release/2015-09-19-accumulo-1.5.2.md b/_posts/release/2014-09-19-accumulo-1.5.2.md similarity index 100% rename from _posts/release/2015-09-19-accumulo-1.5.2.md rename to _posts/release/2014-09-19-accumulo-1.5.2.md diff --git a/_posts/release/2016-09-18-accumulo-1.6.6.md b/_posts/release/2016-09-19-accumulo-1.6.6.md similarity index 100% rename from _posts/release/2016-09-18-accumulo-1.6.6.md rename to _posts/release/2016-09-19-accumulo-1.6.6.md diff --git a/_posts/release/2017-02-26-accumulo-1.8.1.md b/_posts/release/2017-02-27-accumulo-1.8.1.md similarity index 100% rename from _posts/release/2017-02-26-accumulo-1.8.1.md rename to _posts/release/2017-02-27-accumulo-1.8.1.md diff --git a/_posts/release/2017-04-06-accumulo-1.7.3.md b/_posts/release/2017-03-26-accumulo-1.7.3.md similarity index 100% rename from _posts/release/2017-04-06-accumulo-1.7.3.md rename to _posts/release/2017-03-26-accumulo-1.7.3.md diff --git a/_posts/release/2018-04-23-accumulo-1.9.0.md b/_posts/release/2018-04-18-accumulo-1.9.0.md similarity index 100% rename from _posts/release/2018-04-23-accumulo-1.9.0.md rename to _posts/release/2018-04-18-accumulo-1.9.0.md diff --git a/_posts/release/2023-09-20-accumulo-2.1.3.md b/_posts/release/2024-07-10-accumulo-2.1.3.md similarity index 100% rename from _posts/release/2023-09-20-accumulo-2.1.3.md rename to _posts/release/2024-07-10-accumulo-2.1.3.md diff --git a/doap/accumulo-access.rdf b/doap/accumulo-access.rdf new file mode 100644 index ..b7a8f5bf --- /dev/null +++ b/doap/accumulo-access.rdf @@ -0,0 +1,53 @@ + + +http://usefulinc.com/ns/doap#"; xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; xmlns:asfext="http://projects.apache.org/ns/asfext#"; xmlns:foaf="http://xmlns.com/foaf/0.1/"; xml:lang="en"> + + https://accumulo.apache.org";> +2012-03-26 +http://usefulinc.com/doap/licenses/asl20"/> +Apache Accumulo Access Control Library +https://accumulo.apache.org"/> +https://accumulo.apache.org"/> +A library of utilities
(accumulo-website) branch main updated: Fix jekyll cache in GitHub Actions
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 47e77323 Fix jekyll cache in GitHub Actions
47e77323 is described below
commit 47e773237b351f07d98e37d10a08a531e9cc8646
Author: Christopher Tubbs
AuthorDate: Thu Jul 11 14:30:01 2024 -0400
Fix jekyll cache in GitHub Actions
---
.github/workflows/jekyll.yaml | 12 ++--
1 file changed, 2 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/jekyll.yaml b/.github/workflows/jekyll.yaml
index f77b7cb8..2e38e741 100644
--- a/.github/workflows/jekyll.yaml
+++ b/.github/workflows/jekyll.yaml
@@ -30,21 +30,13 @@ jobs:
timeout-minutes: 15
runs-on: ubuntu-latest
steps:
-- uses: actions/checkout@v3
+- uses: actions/checkout@v4
- name: Set up Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 3.2.2
-- name: Cache gems
- uses: actions/cache@v3
- with:
-path: ~/vendor/bundle
-key: ${{ runner.os }}-gem-${{ hashFiles('**/Gemfile.lock') }}
-restore-keys: ${{ runner.os }}-gem
+bundler-cache: true
- name: Test site build
run: |
ruby --version
-gem install bundler
-bundle config path ~/vendor/bundle
-bundle install --jobs 4 --retry 3
bundle exec jekyll build
(accumulo) branch 2.1.3-rc0 deleted (was 4e653026c6)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.1.3-rc0 in repository https://gitbox.apache.org/repos/asf/accumulo.git was 4e653026c6 [maven-release-plugin] prepare release rel/2.1.3 This change permanently discards the following revisions: discard 4e653026c6 [maven-release-plugin] prepare release rel/2.1.3
(accumulo) branch 2.1.3-rc0-next deleted (was d0512e8ee1)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.1.3-rc0-next in repository https://gitbox.apache.org/repos/asf/accumulo.git was d0512e8ee1 [maven-release-plugin] prepare for next development iteration This change permanently discards the following revisions: discard d0512e8ee1 [maven-release-plugin] prepare for next development iteration discard 4e653026c6 [maven-release-plugin] prepare release rel/2.1.3
(accumulo) 01/01: [maven-release-plugin] prepare release rel/2.1.3
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch 2.1.3-rc0 in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 4e653026c6cae54446c1423042ca9af86b97c0a0 Author: Christopher Tubbs AuthorDate: Tue Jul 2 15:42:51 2024 -0400 [maven-release-plugin] prepare release rel/2.1.3 --- 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 78658c3e05..dacc6cd8f6 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 accumulo pom diff --git a/core/pom.xml b/core/pom.xml index 57c8c425b4..d13cdd5730 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 accumulo-core Apache Accumulo Core diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml index a56abf9073..2989ff2b46 100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 accumulo-hadoop-mapreduce Apache Accumulo Hadoop MapReduce diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml index 11fbcb26a4..a3531e6416 100644 --- a/iterator-test-harness/pom.xml +++ b/iterator-test-harness/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 accumulo-iterator-test-harness Apache Accumulo Iterator Test Harness diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 6a17606475..a2fdc9e82d 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 accumulo-minicluster Apache Accumulo MiniCluster diff --git a/pom.xml b/pom.xml index 463fd2944f..9da7e0ca14 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.accumulo accumulo-project - 2.1.3-SNAPSHOT + 2.1.3 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.3 https://gitbox.apache.org/repos/asf?p=accumulo.git @@ -136,7 +136,7 @@ .+-SNAPSHOT,(?i).*(alpha|beta)[0-9.-]*,(?i).*[.-](m|rc)[0-9]+ 17 - 2023-08-14T08:01:47Z + 2024-07-02T19:40:59Z true source-release-tar diff --git a/server/base/pom.xml b/server/base/pom.xml index 13984282d5..a203733e5a 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 ../../pom.xml accumulo-server-base diff --git a/server/compaction-coordinator/pom.xml b/server/compaction-coordinator/pom.xml index 151cc8fdd2..35c26ba13b 100644 --- a/server/compaction-coordinator/pom.xml +++ b/server/compaction-coordinator/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 ../../pom.xml accumulo-compaction-coordinator diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml index e7e4263066..2f8a32dc13 100644 --- a/server/compactor/pom.xml +++ b/server/compactor/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 ../../pom.xml accumulo-compactor diff --git a/server/gc/pom.xml b/server/gc/pom.xml index 1c2d9b9cba..1b4ef984f0 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 ../../pom.xml accumulo-gc diff --git a/server/manager/pom.xml b/server/manager/pom.xml index 920509a740..29d605b7d2 100644 --- a/server/manager/pom.xml +++ b/server/manager/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3-SNAPSHOT +2.1.3 ../../pom.xml
(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.3-rc0-next in repository https://gitbox.apache.org/repos/asf/accumulo.git commit d0512e8ee1a54b605f6040b62478ae4e1e475c77 Author: Christopher Tubbs AuthorDate: Tue Jul 2 15:42:52 2024 -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 dacc6cd8f6..cd657bcb42 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT accumulo pom diff --git a/core/pom.xml b/core/pom.xml index d13cdd5730..659cd8456a 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT accumulo-core Apache Accumulo Core diff --git a/hadoop-mapreduce/pom.xml b/hadoop-mapreduce/pom.xml index 2989ff2b46..bca66f8f62 100644 --- a/hadoop-mapreduce/pom.xml +++ b/hadoop-mapreduce/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT accumulo-hadoop-mapreduce Apache Accumulo Hadoop MapReduce diff --git a/iterator-test-harness/pom.xml b/iterator-test-harness/pom.xml index a3531e6416..f5ad91ebe0 100644 --- a/iterator-test-harness/pom.xml +++ b/iterator-test-harness/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT accumulo-iterator-test-harness Apache Accumulo Iterator Test Harness diff --git a/minicluster/pom.xml b/minicluster/pom.xml index a2fdc9e82d..bde824eb41 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT accumulo-minicluster Apache Accumulo MiniCluster diff --git a/pom.xml b/pom.xml index 9da7e0ca14..59eb29 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ org.apache.accumulo accumulo-project - 2.1.3 + 2.1.4-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.3 +HEAD https://gitbox.apache.org/repos/asf?p=accumulo.git @@ -136,7 +136,7 @@ .+-SNAPSHOT,(?i).*(alpha|beta)[0-9.-]*,(?i).*[.-](m|rc)[0-9]+ 17 - 2024-07-02T19:40:59Z + 2024-07-02T19:42:51Z true source-release-tar diff --git a/server/base/pom.xml b/server/base/pom.xml index a203733e5a..882b3634d8 100644 --- a/server/base/pom.xml +++ b/server/base/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT ../../pom.xml accumulo-server-base diff --git a/server/compaction-coordinator/pom.xml b/server/compaction-coordinator/pom.xml index 35c26ba13b..60e409c384 100644 --- a/server/compaction-coordinator/pom.xml +++ b/server/compaction-coordinator/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT ../../pom.xml accumulo-compaction-coordinator diff --git a/server/compactor/pom.xml b/server/compactor/pom.xml index 2f8a32dc13..6fe9ff6c21 100644 --- a/server/compactor/pom.xml +++ b/server/compactor/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT ../../pom.xml accumulo-compactor diff --git a/server/gc/pom.xml b/server/gc/pom.xml index 1b4ef984f0..00a091dab0 100644 --- a/server/gc/pom.xml +++ b/server/gc/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT ../../pom.xml accumulo-gc diff --git a/server/manager/pom.xml b/server/manager/pom.xml index 29d605b7d2..20da2677cc 100644 --- a/server/manager/pom.xml +++ b/server/manager/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project -2.1.3 +2.1.4-SNAPSHOT
(accumulo) branch 2.1.3-rc0-next created (now d0512e8ee1)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.1.3-rc0-next in repository https://gitbox.apache.org/repos/asf/accumulo.git at d0512e8ee1 [maven-release-plugin] prepare for next development iteration This branch includes the following new commits: new 4e653026c6 [maven-release-plugin] prepare release rel/2.1.3 new d0512e8ee1 [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) branch 2.1.3-rc0 created (now 4e653026c6)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch 2.1.3-rc0 in repository https://gitbox.apache.org/repos/asf/accumulo.git at 4e653026c6 [maven-release-plugin] prepare release rel/2.1.3 This branch includes the following new commits: new 4e653026c6 [maven-release-plugin] prepare release rel/2.1.3 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-website) branch main updated: Update gems
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 eb38a98e Update gems eb38a98e is described below commit eb38a98e49f119d2e7f784e4b55a50e333bd9e92 Author: Christopher Tubbs AuthorDate: Wed Jun 5 16:37:55 2024 -0400 Update gems --- Gemfile.lock | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 5d56b813..007ccd00 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,18 +3,20 @@ GEM specs: addressable (2.8.6) public_suffix (>= 2.0.2, < 6.0) +bigdecimal (3.1.8) colorator (1.1.0) -concurrent-ruby (1.2.3) +concurrent-ruby (1.3.1) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) eventmachine (1.2.7) -ffi (1.16.3) +ffi (1.17.0-x86_64-linux-gnu) forwardable-extended (2.6.0) -google-protobuf (4.26.1-x86_64-linux) +google-protobuf (4.27.0-x86_64-linux) + bigdecimal rake (>= 13) http_parser.rb (0.8.0) -i18n (1.14.4) +i18n (1.14.5) concurrent-ruby (~> 1.0) jekyll (4.3.3) addressable (~> 2.4) @@ -52,13 +54,13 @@ GEM public_suffix (5.0.5) rake (13.2.1) rb-fsevent (0.11.2) -rb-inotify (0.10.1) +rb-inotify (0.11.1) ffi (~> 1.0) rexml (3.2.8) strscan (>= 3.0.9) rouge (4.2.1) safe_yaml (1.0.5) -sass-embedded (1.76.0-x86_64-linux-gnu) +sass-embedded (1.77.4-x86_64-linux-gnu) google-protobuf (>= 3.25, < 5.0) strscan (3.1.0) terminal-table (3.0.2)
