You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2024/07/24 14:24:41 UTC
(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) 02/03: Merge branch 'main' into elasticity
Posted by ct...@apache.org.
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 <ct...@apache.org>
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) 01/03: Merge branch '2.1'
Posted by ct...@apache.org.
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 <ct...@apache.org>
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
Posted by ct...@apache.org.
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 <ct...@apache.org>
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<Throwable> err = new AtomicReference<>();
- final AtomicLong timeSinceLastCompletion = new AtomicLong(0L);
final LogSorter logSorter = new LogSorter(getContext(), getConfiguration());
long nextSortLogsCheckTime = System.currentTimeMillis();