[accumulo-website] branch tour-website deleted (was e132b6a)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch tour-website in repository https://gitbox.apache.org/repos/asf/accumulo-website.git. was e132b6a ACCUMULO-4734 Changes from review of tour (#43) This change permanently discards the following revisions: discard e132b6a ACCUMULO-4734 Changes from review of tour (#43)
[accumulo-website] branch asf-site-old-builds created (now a4ba38b)
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a change to branch asf-site-old-builds in repository https://gitbox.apache.org/repos/asf/accumulo-website.git. at a4ba38b Jekyll build from master:0badae8 No new revisions were added by this update.
Buildbot success in on jekyll_websites
The Buildbot has detected a passing build on builder jekyll_websites while building accumulo. Full details are available at: https://ci2.apache.org/#builders/7/builds/21 Buildbot URL: https://ci2.apache.org/ Worker for this Build: bb_slave10_ubuntu Build Reason: Triggered jekyll auto-build via .asf.yaml by ctubbsii Blamelist: asfinfra, commits@accumulo.apache.org Build succeeded! Sincerely, -The Buildbot
[accumulo-website] branch master updated: Remove unnecessary includes line in Jekyll config
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo-website.git The following commit(s) were added to refs/heads/master by this push: new 9794b21 Remove unnecessary includes line in Jekyll config 9794b21 is described below commit 9794b21d58a1a2e0463177670d54eb1cfbe42078 Author: Christopher Tubbs AuthorDate: Wed Jan 29 00:22:03 2020 -0500 Remove unnecessary includes line in Jekyll config --- _config.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/_config.yml b/_config.yml index 0b09737..f674a52 100644 --- a/_config.yml +++ b/_config.yml @@ -29,9 +29,6 @@ collections: output: true permalink: "/docs/2.x/:path" -include: - - .htaccess - defaults: - scope:
[accumulo-website] 02/02: Add staging/publish config in .asf.yaml
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/accumulo-website.git commit 0c4136075ae254dfe6487d806dc4612778087e6e Author: Christopher Tubbs AuthorDate: Wed Jan 29 00:19:52 2020 -0500 Add staging/publish config in .asf.yaml --- .asf.yaml | 8 1 file changed, 8 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..bf8345d --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,8 @@ + +staging: + profile: ~ + whoami: asf-staging + +publish: + whoami: asf-site +
[accumulo-website] 01/02: Initial commit for asf-staging
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/accumulo-website.git commit 36fa858058fadc970db534cfb2efc6de2a8bb72a Author: Christopher Tubbs AuthorDate: Wed Jan 29 00:19:13 2020 -0500 Initial commit for asf-staging
[accumulo-website] 02/02: Add staging/publish config in .asf.yaml
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/accumulo-website.git commit 0c4136075ae254dfe6487d806dc4612778087e6e Author: Christopher Tubbs AuthorDate: Wed Jan 29 00:19:52 2020 -0500 Add staging/publish config in .asf.yaml --- .asf.yaml | 8 1 file changed, 8 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..bf8345d --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,8 @@ + +staging: + profile: ~ + whoami: asf-staging + +publish: + whoami: asf-site +
[accumulo-website] 01/02: Initial commit for asf-staging
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/accumulo-website.git commit 36fa858058fadc970db534cfb2efc6de2a8bb72a Author: Christopher Tubbs AuthorDate: Wed Jan 29 00:19:13 2020 -0500 Initial commit for asf-staging
Buildbot success in on jekyll_websites
The Buildbot has detected a passing build on builder jekyll_websites while building accumulo. Full details are available at: https://ci2.apache.org/#builders/7/builds/20 Buildbot URL: https://ci2.apache.org/ Worker for this Build: bb_slave10_ubuntu Build Reason: Triggered jekyll auto-build via .asf.yaml by ctubbsii Blamelist: asfinfra, commits@accumulo.apache.org Build succeeded! Sincerely, -The Buildbot
[accumulo-website] branch master updated: Remove possibly unnecessary copy of .asf.yaml
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo-website.git The following commit(s) were added to refs/heads/master by this push: new f8d6f94 Remove possibly unnecessary copy of .asf.yaml f8d6f94 is described below commit f8d6f94057d3ea02189cfa9117705b2e9cc53702 Author: Christopher Tubbs AuthorDate: Wed Jan 29 00:04:49 2020 -0500 Remove possibly unnecessary copy of .asf.yaml Removes copying .asf.yaml to asf-staging branch's output directory, where it isn't needed. --- _config.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/_config.yml b/_config.yml index 65bfed8..0b09737 100644 --- a/_config.yml +++ b/_config.yml @@ -30,7 +30,6 @@ collections: permalink: "/docs/2.x/:path" include: - - .asf.yaml - .htaccess defaults:
[accumulo-website] 01/01: Initial commit for asf-staging
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/accumulo-website.git commit 31257c290bcf9a7dc5f4fa21a025a048a70956c1 Author: Christopher Tubbs AuthorDate: Wed Jan 29 00:00:21 2020 -0500 Initial commit for asf-staging
[accumulo-website] 01/01: Initial commit for asf-staging
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch asf-staging in repository https://gitbox.apache.org/repos/asf/accumulo-website.git commit 31257c290bcf9a7dc5f4fa21a025a048a70956c1 Author: Christopher Tubbs AuthorDate: Wed Jan 29 00:00:21 2020 -0500 Initial commit for asf-staging
Buildbot success in on jekyll_websites
The Buildbot has detected a passing build on builder jekyll_websites while building accumulo. Full details are available at: https://ci2.apache.org/#builders/7/builds/19 Buildbot URL: https://ci2.apache.org/ Worker for this Build: bb_slave10_ubuntu Build Reason: Triggered jekyll auto-build via .asf.yaml by ctubbsii Blamelist: asfinfra, commits@accumulo.apache.org Build succeeded! Sincerely, -The Buildbot
[accumulo-website] branch master updated: Make ruby min-version 2.5.1
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo-website.git The following commit(s) were added to refs/heads/master by this push: new 4a3d15e Make ruby min-version 2.5.1 4a3d15e is described below commit 4a3d15eceb02a46feb9daa192216acdee4742b8f Author: Christopher Tubbs AuthorDate: Tue Jan 28 23:21:39 2020 -0500 Make ruby min-version 2.5.1 Change the minimum version of ruby to 2.5.1, since that's what's used on ASF buildbot Jekyll builders. Everything should work okay with that version. We'll see... :) --- .gitignore | 1 + Gemfile| 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 331452d..47aab83 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /vendor /.idea /*.iml +/.bundle/ diff --git a/Gemfile b/Gemfile index 760e1a8..53a5559 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -ruby '>2.5.4' +ruby '>=2.5.1' source 'https://rubygems.org' gem 'jekyll', '>= 3.7.4' gem 'jekyll-redirect-from', '>= 0.13.0'
Buildbot failure in on jekyll_websites
The Buildbot has detected a failed build on builder jekyll_websites while building accumulo. Full details are available at: https://ci2.apache.org/#builders/7/builds/18 Buildbot URL: https://ci2.apache.org/ Worker for this Build: bb_slave10_ubuntu Build Reason: Triggered jekyll auto-build via .asf.yaml by ctubbsii Blamelist: asfinfra, commits@accumulo.apache.org BUILD FAILED: failed '/usr/local/bin/jekyll-build.py --sourcetype ...' (failure) Sincerely, -The Buildbot
[accumulo-website] branch master updated: Update to bundler2
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo-website.git The following commit(s) were added to refs/heads/master by this push: new b89366d Update to bundler2 b89366d is described below commit b89366dabcbd20e6d1d559338a57c626e28db772 Author: Christopher Tubbs AuthorDate: Tue Jan 28 17:48:58 2020 -0500 Update to bundler2 --- Gemfile.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 9152995..01eb831 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -29,7 +29,7 @@ GEM rouge (~> 3.0) safe_yaml (~> 1.0) terminal-table (~> 1.8) -jekyll-redirect-from (0.15.0) +jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) jekyll-sass-converter (2.0.1) sassc (> 2.0.1, < 3.0) @@ -74,4 +74,4 @@ RUBY VERSION ruby 2.6.5p114 BUNDLED WITH - 1.17.2 + 2.1.4
[accumulo] branch master updated (1c1a304 -> 0ff1542)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 1c1a304 Merge remote-tracking branch 'upstream/master' add 9cc673a fixes #1474: Option to leave cloned tables offline (#1475) add 0ff1542 Merge branch '1.9' No new revisions were added by this update. Summary of changes: .../core/client/admin/CloneConfiguration.java | 118 + .../core/client/admin/TableOperations.java | 20 .../core/clientImpl/CloneConfigurationImpl.java| 118 + .../core/clientImpl/TableOperationsImpl.java | 17 ++- .../core/clientImpl/TableOperationsHelperTest.java | 4 + .../apache/accumulo/master/FateServiceHandler.java | 9 +- .../accumulo/master/tableOps/clone/CloneInfo.java | 1 + .../accumulo/master/tableOps/clone/CloneTable.java | 3 +- .../master/tableOps/clone/FinishCloneTable.java| 6 +- .../accumulo/shell/commands/CloneTableCommand.java | 15 ++- .../org/apache/accumulo/test/ShellServerIT.java| 23 .../accumulo/test/functional/CloneTestIT.java | 46 12 files changed, 372 insertions(+), 8 deletions(-) create mode 100644 core/src/main/java/org/apache/accumulo/core/client/admin/CloneConfiguration.java create mode 100644 core/src/main/java/org/apache/accumulo/core/clientImpl/CloneConfigurationImpl.java
[accumulo-website] branch master updated: Force site build
This is an automated email from the ASF dual-hosted git repository. ctubbsii pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo-website.git The following commit(s) were added to refs/heads/master by this push: new 42ef820 Force site build 42ef820 is described below commit 42ef820b9e96040869f332171d101f5e73c6e2b9 Author: Christopher Tubbs AuthorDate: Tue Jan 28 16:28:32 2020 -0500 Force site build
Buildbot failure in on jekyll_websites
The Buildbot has detected a failed build on builder jekyll_websites while building accumulo. Full details are available at: https://ci2.apache.org/#builders/7/builds/17 Buildbot URL: https://ci2.apache.org/ Worker for this Build: bb_slave10_ubuntu Build Reason: Triggered jekyll auto-build via .asf.yaml by ctubbsii Blamelist: asfinfra, commits@accumulo.apache.org BUILD FAILED: failed '/usr/local/bin/jekyll-build.py --sourcetype ...' (failure) Sincerely, -The Buildbot
Buildbot failure in on jekyll_websites
The Buildbot has detected a failed build on builder jekyll_websites while building accumulo. Full details are available at: https://ci2.apache.org/#builders/7/builds/16 Buildbot URL: https://ci2.apache.org/ Worker for this Build: bb_slave10_ubuntu Build Reason: Triggered jekyll auto-build via .asf.yaml by ctubbsii Blamelist: asfinfra, commits@accumulo.apache.org BUILD FAILED: failed '/usr/local/bin/jekyll-build.py --sourcetype ...' (failure) Sincerely, -The Buildbot
[accumulo-website] branch master updated: Update README to use asf-staging (#217)
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo-website.git
The following commit(s) were added to refs/heads/master by this push:
new d4439a3 Update README to use asf-staging (#217)
d4439a3 is described below
commit d4439a39cbd56a5524fcfe8b89c0f17471d8fe38
Author: Christopher Tubbs
AuthorDate: Tue Jan 28 16:04:06 2020 -0500
Update README to use asf-staging (#217)
---
.asf.yaml | 2 +-
.travis.yml | 1 +
README.md | 196 ++--
_devtools/git-hooks/post-commit | 57
4 files changed, 129 insertions(+), 127 deletions(-)
diff --git a/.asf.yaml b/.asf.yaml
index 74795e5..d85c77d 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -7,7 +7,7 @@ publish:
whoami: asf-site
github:
- description: "Apache Accumulo website"
+ description: "Apache Accumulo Website"
homepage: https://accumulo.apache.org/
labels:
- accumulo
diff --git a/.travis.yml b/.travis.yml
index cb0c989..bd4eac4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,5 +4,6 @@ rvm:
branches:
except:
- asf-site
+- asf-staging
cache: bundler
script: ./_devtools/cibuild
diff --git a/README.md b/README.md
index e54582b..190655f 100644
--- a/README.md
+++ b/README.md
@@ -1,47 +1,20 @@
# Apache Accumulo Website
-Apache Accumulo uses [Jekyll] to build their website. It is recommended that
you
-use [Bundler] to install the necessary dependencies to run and build the
website.
+Apache Accumulo's website is generated from Markdown source (specifically,
+[kramdown] style) with [Jekyll], using [Bundler] to manage its gem
+dependencies.
-## Install Bundler and dependencies
+## Development
-Ruby is required to use Bundler so first make sure you have Ruby on your
machine. If you are using
-an OS packaged version of Ruby, you will have to also install the ruby-dev
(Ubuntu) or
-ruby-devel (Fedora) package as well. Depending on your OS, you may also need
other packages, such as
-ruby-full, make, gcc, nodejs, build-essentials, or patch.
+### Custom Liquid Tags
-With Ruby installed on your machine, you can install [Bundler] using the
command below:
+Jekyll uses [Liquid] to process files before interpreting their Markdown
+contents. We have extended Jekyll using its plugin mechanism to create custom
+Liquid tags that make it easier to link to javadocs, properties, and documents.
-gem install bundler
+The source for these tags is at [\_plugins/links.rb](_plugins/links.rb).
-Next, use [Bundler] to install [Jekyll] and other dependencies needed to run
the website.
-
-git clone https://github.com/apache/accumulo-website
-cd accumulo-website
-bundle install
-
-## Run the website locally
-
-Run the following command to run the website locally using Jekyll's embedded
webserver:
-
-cd accumulo-website
-bundle exec jekyll serve -w
-
-The website can viewed at [http://0.0.0.0:4000/](http://0.0.0.0:4000/)
-
-## Build website static HTML files
-
-You can just build static HTML files which are viewable in `_config.yml`:
-
-cd accumulo-website
-bundle exec jekyll build
-
-## Custom liquid tags
-
-Custom liquid tags are used to make linking to javadocs, properties, and
documents easier.
-The source for these tags is at [_plugins/links.rb](_plugins/links.rb).
-
-| Tag | Description| Options
| Examples
|
+| Tag | Description| Options
| Examples
|
| - | -- |
---
| |
| jlink | Creates Javadoc link | Link text will be class name by default.
Use `-f` for full package + class name | `{% jlink -f
org.apache.accumulo.core.client.Connector %}` `{% jlink -f
org.apache.accumulo.core.client %}` |
| jurl | Creates Javadoc URL| None
| `{% jurl
org.apache.accumulo.core.client.Connector %}` |
@@ -53,54 +26,139 @@ The source for these tags is at
[_plugins/links.rb](_plugins/links.rb).
| ghc | GitHub code link | Branch defaults to `gh_branch` setting
in `_config.yml`. Override using `-b` | `{% ghc
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java %}`
`{% ghc -b 1.9 README.md %}` |
| jira | Jira issue link | None | `{% jira ACCUMULO-1000 %}` |
-## Updating property documentation
+### Updating Property Documentation for Releases
-Building Accumulo generates `server-properties.md` and
`client-properties.md`. To
-regenerat
[accumulo] branch master updated (b026357 -> 1c1a304)
This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from b026357 Merge updates from 1.9 - fixes typos. (#1484) add 5575bc7 Merge remote-tracking branch 'remotes/upstream/1.9' add be2b302 fix merge issues add 1c1a304 Merge remote-tracking branch 'upstream/master' No new revisions were added by this update. Summary of changes:
[accumulo] branch master updated (80dde61 -> b026357)
This is an automated email from the ASF dual-hosted git repository. edcoleman pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 80dde61 Merge branch '1.9' add b026357 Merge updates from 1.9 - fixes typos. (#1484) No new revisions were added by this update. Summary of changes: core/src/main/java/org/apache/accumulo/core/conf/Property.java | 4 ++-- server/master/src/main/java/org/apache/accumulo/master/Master.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
[accumulo] branch 1.9 updated: fixes #1474: Option to leave cloned tables offline (#1475)
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.9 by this push:
new 9cc673a fixes #1474: Option to leave cloned tables offline (#1475)
9cc673a is described below
commit 9cc673a4d7096207ff3ff619bc5c9f718faa225a
Author: Ivan Bella
AuthorDate: Tue Jan 28 13:59:09 2020 -0500
fixes #1474: Option to leave cloned tables offline (#1475)
* Added an optional keepOffline option to TableOperations.clone via a
CloneConfiguration
* Updated the shell clone command with a -o option
* Updated the CloneTestIT to test the keepOffline option
* Updated the ShellServerIT to test the -o option
---
.../core/client/admin/CloneConfiguration.java | 118 +
.../core/client/admin/TableOperations.java | 20
.../core/client/impl/CloneConfigurationImpl.java | 118 +
.../core/client/impl/TableOperationsImpl.java | 17 ++-
.../core/client/mock/MockTableOperations.java | 8 ++
.../client/impl/TableOperationsHelperTest.java | 6 ++
.../apache/accumulo/master/FateServiceHandler.java | 9 +-
.../apache/accumulo/master/tableOps/CloneInfo.java | 1 +
.../accumulo/master/tableOps/CloneTable.java | 3 +-
.../accumulo/master/tableOps/FinishCloneTable.java | 6 +-
.../accumulo/shell/commands/CloneTableCommand.java | 15 ++-
.../org/apache/accumulo/test/ShellServerIT.java| 23
.../accumulo/test/functional/CloneTestIT.java | 44
13 files changed, 380 insertions(+), 8 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/admin/CloneConfiguration.java
b/core/src/main/java/org/apache/accumulo/core/client/admin/CloneConfiguration.java
new file mode 100644
index 000..4f9ea89
--- /dev/null
+++
b/core/src/main/java/org/apache/accumulo/core/client/admin/CloneConfiguration.java
@@ -0,0 +1,118 @@
+/*
+ * 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
+ *
+ * http://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.client.admin;
+
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.accumulo.core.client.impl.CloneConfigurationImpl;
+
+/**
+ * A configuration object that can be used with the table clone command in the
+ * {@link TableOperations}.
+ *
+ * @since 1.10 and 2.1
+ */
+public interface CloneConfiguration {
+ /**
+ * Determines if memory is flushed in the source table before cloning.
+ *
+ * @return true if memory is flushed in the source table before cloning.
+ */
+ public boolean isFlush();
+
+ /**
+ * The source table properties are copied. This allows overriding of some of
those properties.
+ *
+ * @return The source table properties to override.
+ */
+ public Map getPropertiesToSet();
+
+ /**
+ * The source table properties are copied, this allows reverting to system
defaults for some of
+ * those properties.
+ *
+ * @return The properties that are to be reverted to system defaults.
+ */
+ public Set getPropertiesToExclude();
+
+ /**
+ * The new table is normally brought online after the cloning process. This
allows leaving the new
+ * table offline
+ *
+ * @return true if the new table is to be kept offline after cloning.
+ */
+ public boolean isKeepOffline();
+
+ /**
+ * A CloneConfiguration builder
+ *
+ * @since 1.10 and 2.1
+ */
+ public static interface Builder {
+/**
+ * Determines if memory is flushed in the source table before cloning.
+ *
+ * @param flush
+ * true if memory is flushed in the source table before cloning.
+ */
+public Builder setFlush(boolean flush);
+
+/**
+ * The source table properties are copied. This allows overriding of some
of those properties.
+ *
+ * @param propertiesToSet
+ * The source table properties to override.
+ */
+public Builder setPropertiesToSet(Map propertiesToSet);
+
+/**
+ * The source table properties are copied, this allows reverting to system
defaults for some of
+ * those properties.
+ *
+ * @param propertiesToExclude
+ * The properties tha
[accumulo] branch master updated (3bd262f -> 80dde61)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 3bd262f Merge branch '1.9' add ed1bb67 Make ITs override defaultTimeoutSeconds (#1483) new 80dde61 Merge branch '1.9' 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: .../org/apache/accumulo/test/GarbageCollectWALIT.java | 7 ++- .../java/org/apache/accumulo/test/LargeSplitRowIT.java | 7 ++- .../org/apache/accumulo/test/MetaGetsReadersIT.java | 7 +-- .../java/org/apache/accumulo/test/MetaRecoveryIT.java | 7 ++- .../org/apache/accumulo/test/MultiTableRecoveryIT.java | 7 ++- .../org/apache/accumulo/test/ScanFlushWithTimeIT.java | 7 ++- .../java/org/apache/accumulo/test/ShellServerIT.java| 2 +- .../org/apache/accumulo/test/TabletServerGivesUpIT.java | 7 ++- .../apache/accumulo/test/TabletServerHdfsRestartIT.java | 7 ++- .../java/org/apache/accumulo/test/TotalQueuedIT.java| 7 ++- .../main/java/org/apache/accumulo/test/UnusedWALIT.java | 10 +- .../apache/accumulo/test/VerifySerialRecoveryIT.java| 7 ++- .../apache/accumulo/test/functional/DeleteRowsIT.java | 4 ++-- .../apache/accumulo/test/functional/DurabilityIT.java | 17 +++-- .../accumulo/test/functional/RegexGroupBalanceIT.java | 7 ++- .../accumulo/test/functional/SessionDurabilityIT.java | 13 + .../GarbageCollectorCommunicatesWithTServersIT.java | 2 +- .../test/replication/MultiInstanceReplicationIT.java| 2 +- 18 files changed, 95 insertions(+), 32 deletions(-)
[accumulo] 01/01: Merge branch '1.9'
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 80dde6105da995af5e9b4368d21194ceda9a66b2
Merge: 3bd262f ed1bb67
Author: Mike Miller
AuthorDate: Tue Jan 28 10:29:19 2020 -0500
Merge branch '1.9'
Conflicts:
test/src/main/java/org/apache/accumulo/test/BalanceFasterIT.java
test/src/main/java/org/apache/accumulo/test/ManySplitIT.java
test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java
test/src/main/java/org/apache/accumulo/test/TotalQueuedIT.java
test/src/main/java/org/apache/accumulo/test/UnusedWALIT.java
test/src/main/java/org/apache/accumulo/test/functional/DurabilityIT.java
test/src/main/java/org/apache/accumulo/test/performance/RollWALPerformanceIT.java
test/src/main/java/org/apache/accumulo/test/replication/ReplicationRandomWalkIT.java
.../org/apache/accumulo/test/GarbageCollectWALIT.java | 7 ++-
.../java/org/apache/accumulo/test/LargeSplitRowIT.java | 7 ++-
.../org/apache/accumulo/test/MetaGetsReadersIT.java | 7 +--
.../java/org/apache/accumulo/test/MetaRecoveryIT.java | 7 ++-
.../org/apache/accumulo/test/MultiTableRecoveryIT.java | 7 ++-
.../org/apache/accumulo/test/ScanFlushWithTimeIT.java | 7 ++-
.../java/org/apache/accumulo/test/ShellServerIT.java| 2 +-
.../org/apache/accumulo/test/TabletServerGivesUpIT.java | 7 ++-
.../apache/accumulo/test/TabletServerHdfsRestartIT.java | 7 ++-
.../java/org/apache/accumulo/test/TotalQueuedIT.java| 7 ++-
.../main/java/org/apache/accumulo/test/UnusedWALIT.java | 10 +-
.../apache/accumulo/test/VerifySerialRecoveryIT.java| 7 ++-
.../apache/accumulo/test/functional/DeleteRowsIT.java | 4 ++--
.../apache/accumulo/test/functional/DurabilityIT.java | 17 +++--
.../accumulo/test/functional/RegexGroupBalanceIT.java | 7 ++-
.../accumulo/test/functional/SessionDurabilityIT.java | 13 +
.../GarbageCollectorCommunicatesWithTServersIT.java | 2 +-
.../test/replication/MultiInstanceReplicationIT.java| 2 +-
18 files changed, 95 insertions(+), 32 deletions(-)
diff --cc test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java
index c902129,43eed8b..0981dd1
--- a/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/MetaGetsReadersIT.java
@@@ -57,12 -53,19 +56,17 @@@ public class MetaGetsReadersIT extends
cfg.setProperty(Property.TABLE_BLOCKCACHE_ENABLED, "false");
}
+ @Override
+ protected int defaultTimeoutSeconds() {
+ return 2 * 60;
+ }
+
- private static Thread slowScan(final Connector c, final String tableName,
+ private static Thread slowScan(final AccumuloClient c, final String
tableName,
final AtomicBoolean stop) {
-Thread thread = new Thread() {
- @Override
- public void run() {
-try {
- while (stop.get() == false) {
-Scanner s = c.createScanner(tableName, Authorizations.EMPTY);
+return new Thread(() -> {
+ try {
+while (!stop.get()) {
+ try (Scanner s = c.createScanner(tableName, Authorizations.EMPTY)) {
IteratorSetting is = new IteratorSetting(50, SlowIterator.class);
SlowIterator.setSleepTime(is, 10);
s.addScanIterator(is);
@@@ -71,52 -74,48 +75,51 @@@
iterator.next();
}
}
-} catch (Exception ex) {
- log.trace("{}", ex.getMessage(), ex);
- stop.set(true);
}
+ } catch (Exception ex) {
+log.trace("{}", ex.getMessage(), ex);
+stop.set(true);
}
-};
-return thread;
+});
}
- @Test(timeout = 2 * 60 * 1000)
public void test() throws Exception {
final String tableName = getUniqueNames(1)[0];
-final Connector c = getConnector();
-c.tableOperations().create(tableName);
-Random random = new Random();
-BatchWriter bw = c.createBatchWriter(tableName, null);
-for (int i = 0; i < 5; i++) {
- byte[] row = new byte[100];
- random.nextBytes(row);
- Mutation m = new Mutation(row);
- m.put("", "", "");
- bw.addMutation(m);
+try (AccumuloClient c =
Accumulo.newClient().from(getClientProperties()).build()) {
+ c.tableOperations().create(tableName);
+ Random random = new SecureRandom();
+ try (BatchWriter bw = c.createBatchWriter(tableName)) {
+for (int i = 0; i < 5; i++) {
+ byte[] row = new byte[100];
+ random.nextBytes(row);
+ Mutation m = new Mutation(row);
+ m.put("", "", "");
+ bw.addMutation(m);
+}
+ }
+ c.tableOperations().flush(tableName, null, null, true);
+ final AtomicBool
[accumulo] 01/01: Merge branch '1.9'
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit 3bd262f8eb8cdf81b461055f9cb9b7ce95530b3e Merge: 53db996 ce5085e Author: Mike Miller AuthorDate: Tue Jan 28 10:08:47 2020 -0500 Merge branch '1.9' * git merge 1.9 -sours * of ce5085eb4cc705bf8140b416fe508c2a2bc6ed85
[accumulo] branch master updated (53db996 -> 3bd262f)
This is an automated email from the ASF dual-hosted git repository. mmiller pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 53db996 Drop unused params in TabletData. Also formatting add ce5085e Require x tservers on start (#1158) new 3bd262f Merge branch '1.9' 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:
