[accumulo-website] branch master updated: Grammar fix
This is an automated email from the ASF dual-hosted git repository. mdrob 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 112b6bb Grammar fix 112b6bb is described below commit 112b6bb39b66f7a451b058f130bcb4b9f33dbc40 Author: Mike Drob AuthorDate: Mon Jun 11 16:21:50 2018 -0500 Grammar fix --- _posts/release/2017-09-05-accumulo-2.0.0.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_posts/release/2017-09-05-accumulo-2.0.0.md b/_posts/release/2017-09-05-accumulo-2.0.0.md index a2ce234..e62f362 100644 --- a/_posts/release/2017-09-05-accumulo-2.0.0.md +++ b/_posts/release/2017-09-05-accumulo-2.0.0.md @@ -64,7 +64,7 @@ which has the following benefits: The log4j configuration of Accumulo services was improved in [ACCUMULO-4588] with the following changes: * Logging is now configured using standard log4j JVM property 'log4j.configuration' in accumulo-env.sh. -* Tarball ships with less log4j config files (3 rather than 6) which are all log4j properties files. +* Tarball ships with fewer log4j config files (3 rather than 6) which are all log4j properties files. * Log4j XML can still be used by editing accumulo-env.sh * Removed auditLog.xml and added audit log configuration to log4j-service properties files * Accumulo conf/ directory no longer has an examples/ directory. Configuration files ship in conf/ and are -- To stop receiving notification emails like this one, please contact md...@apache.org.
[accumulo-website] branch asf-site updated: Jekyll build from master:112b6bb
This is an automated email from the ASF dual-hosted git repository. mdrob pushed a commit to branch asf-site in repository https://gitbox.apache.org/repos/asf/accumulo-website.git The following commit(s) were added to refs/heads/asf-site by this push: new c3388b4 Jekyll build from master:112b6bb c3388b4 is described below commit c3388b45d7f56f9e611e54610d6fab2174f37f9d Author: Mike Drob AuthorDate: Mon Jun 11 16:45:48 2018 -0500 Jekyll build from master:112b6bb Grammar fix --- feed.xml | 24 people/index.html | 5 + redirects.json| 2 +- release/accumulo-2.0.0/index.html | 2 +- search_data.json | 2 +- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/feed.xml b/feed.xml index 4339e80..87753fc 100644 --- a/feed.xml +++ b/feed.xml @@ -6,8 +6,8 @@ https://accumulo.apache.org/ https://accumulo.apache.org/feed.xml"; rel="self" type="application/rss+xml"/> -Mon, 04 Jun 2018 14:14:10 -0400 -Mon, 04 Jun 2018 14:14:10 -0400 +Mon, 11 Jun 2018 16:45:33 -0500 +Mon, 11 Jun 2018 16:45:33 -0500 Jekyll v3.7.3 @@ -67,7 +67,7 @@ successful verification. The integration tests were run against both Hadoop 2.6.4 and Hadoop 3.0.0.</p> -Mon, 14 May 2018 00:00:00 -0400 +Mon, 14 May 2018 00:00:00 -0500 https://accumulo.apache.org/release/accumulo-1.9.1/ https://accumulo.apache.org/release/accumulo-1.9.1/ @@ -193,7 +193,7 @@ Randomwalk was run for 2 days with 7 walkers. Continuous ingest was run with 9 nodes for 24 hours followed by a successful verification.</p> -Mon, 23 Apr 2018 00:00:00 -0400 +Mon, 23 Apr 2018 00:00:00 -0500 https://accumulo.apache.org/release/accumulo-1.9.0/ https://accumulo.apache.org/release/accumulo-1.9.0/ @@ -322,7 +322,7 @@ on Hadoop 2.2.0, the IT passed with a newer version of Hadoop.</p> </ul> -Fri, 23 Mar 2018 00:00:00 -0400 +Fri, 23 Mar 2018 00:00:00 -0500 https://accumulo.apache.org/release/accumulo-1.7.4/ https://accumulo.apache.org/release/accumulo-1.7.4/ @@ -414,7 +414,7 @@ sending data, you may need to refresh the dashboard page in the browser to start </ol> -Thu, 22 Mar 2018 00:00:00 -0400 +Thu, 22 Mar 2018 00:00:00 -0500 https://accumulo.apache.org/blog/2018/03/22/view-metrics-in-grafana.html https://accumulo.apache.org/blog/2018/03/22/view-metrics-in-grafana.html @@ -443,7 +443,7 @@ sending data, you may need to refresh the dashboard page in the browser to start <p>There is no plan to migrate all existing issues in JIRA. The plan is to only migrate issues that someone is interested in or are actively being worked. Migration is done by linking the JIRA and GitHub issues to each other and then closing the JIRA issue. No new issues should be opened in JIRA. JIRA will eventually be transitioned to a read only state.</p> -Fri, 16 Mar 2018 00:00:00 -0400 +Fri, 16 Mar 2018 00:00:00 -0500 https://accumulo.apache.org/blog/2018/03/16/moving-to-github-issues.html https://accumulo.apache.org/blog/2018/03/16/moving-to-github-issues.html @@ -474,7 +474,7 @@ following Accumulo concepts:</p> <p>More exercises (such as one on Accumulo Iterators) will be added in the future so check for updates.</p> -Tue, 12 Dec 2017 00:00:00 -0500 +Tue, 12 Dec 2017 00:00:00 -0600 https://accumulo.apache.org/blog/2017/12/12/take-the-accumulo-tour.html https://accumulo.apache.org/blog/2017/12/12/take-the-accumulo-tour.html @@ -494,7 +494,7 @@ following Accumulo concepts:</p> <p><a href="http://accumulosummit.com/program/submit-talk/">Submit a talk</a> if you would like to speak at the event.</p> -Thu, 27 Jul 2017 00:00:00 -0400 +Thu, 27 Jul 2017 00:00:00 -0500 https://accumulo.apache.org/blog/2017/07/27/accumulo-summmit-on-october-16.html https://accumulo.apache.org/blog/2017/07/27/accumulo-summmit-on-october-16.html @@ -527,7 +527,7 @@ the <a href="/docs/2.0/">documentation</a>. Each page has and submit a pull request to the <a href="https://github.com/apache/accumulo-website">website repository</a>. A committer will review your changes so don’t be afraid to contribute!</p> -Thu, 29 Jun 2017 00:00:00 -0400 +Thu, 29 Jun 2017 00:00:00 -0500 https://accumulo.apache.org/blog/2017/06/29/accumulo-documentation-improvements.html https://accumulo.apache.org/blog/2017/06/29/accumulo-documentation-improvements.html @@ -621,7 +621,7 @@ use at this time, M
[2/3] accumulo git commit: Jekyll build from gh-pages:976bf7f
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d52fbf6a/1.7/examples/tabletofile.html -- diff --git a/1.7/examples/tabletofile.html b/1.7/examples/tabletofile.html index b84b861..2f69663 100644 --- a/1.7/examples/tabletofile.html +++ b/1.7/examples/tabletofile.html @@ -115,6 +115,7 @@ People https://blogs.apache.org/accumulo";>Blog Community Projects + Thanks Governance Bylaws http://git-wip-us.apache.org/repos/asf/accumulo/blob/d52fbf6a/1.7/examples/terasort.html -- diff --git a/1.7/examples/terasort.html b/1.7/examples/terasort.html index b9d41f8..c37edfa 100644 --- a/1.7/examples/terasort.html +++ b/1.7/examples/terasort.html @@ -115,6 +115,7 @@ People https://blogs.apache.org/accumulo";>Blog Community Projects + Thanks Governance Bylaws http://git-wip-us.apache.org/repos/asf/accumulo/blob/d52fbf6a/1.7/examples/visibility.html -- diff --git a/1.7/examples/visibility.html b/1.7/examples/visibility.html index ddc8d90..4d27f21 100644 --- a/1.7/examples/visibility.html +++ b/1.7/examples/visibility.html @@ -115,6 +115,7 @@ People https://blogs.apache.org/accumulo";>Blog Community Projects + Thanks Governance Bylaws http://git-wip-us.apache.org/repos/asf/accumulo/blob/d52fbf6a/bylaws.html -- diff --git a/bylaws.html b/bylaws.html index 7108f3c..adc07df 100644 --- a/bylaws.html +++ b/bylaws.html @@ -120,6 +120,7 @@ People https://blogs.apache.org/accumulo";>Blog Community Projects + Thanks Governance Bylaws http://git-wip-us.apache.org/repos/asf/accumulo/blob/d52fbf6a/contrib.html -- diff --git a/contrib.html b/contrib.html index 988bbc2..f149b95 100644 --- a/contrib.html +++ b/contrib.html @@ -120,6 +120,7 @@ People https://blogs.apache.org/accumulo";>Blog Community Projects + Thanks Governance Bylaws http://git-wip-us.apache.org/repos/asf/accumulo/blob/d52fbf6a/downloads/index.html -- diff --git a/downloads/index.html b/downloads/index.html index 95370e9..c2625d6 100644 --- a/downloads/index.html +++ b/downloads/index.html @@ -120,6 +120,7 @@ People https://blogs.apache.org/accumulo";>Blog Community Projects + Thanks Governance Bylaws http://git-wip-us.apache.org/repos/asf/accumulo/blob/d52fbf6a/example/wikisearch.html -- diff --git a/example/wikisearch.html b/example/wikisearch.html index 5e0e0fe..e5bb661 100644 --- a/example/wikisearch.html +++ b/example/wikisearch.html @@ -115,6 +115,7 @@ People https://blogs.apache.org/accumulo";>Blog Community Projects + Thanks Governance Bylaws http://git-wip-us.apache.org/repos/asf/accumulo/blob/d52fbf6a/feed.xml -- diff --git a/feed.xml b/feed.xml index c2767f1..62c184b 100644 --- a/feed.xml +++ b/feed.xml @@ -6,8 +6,8 @@ https://accumulo.apache.org/ https://accumulo.apache.org/feed.xml"; rel="self" type="application/rss+xml"/> -Thu, 23 Jun 2016 17:32:45 -0400 -Thu, 23 Jun 2016 17:32:45 -0400 +Tue, 05 Jul 2016 13:34:47 -0500 +Tue, 05 Jul 2016 13:34:47 -0500 Jekyll v3.0.5 http://git-wip-us.apache.org/repos/asf/accumulo/blob/d52fbf6a/get_involved.html -- diff --git a/get_involved.html b/get_involved.html index a381660..6b88bda 100644 --- a/get_involved.html +++ b/get_involved.html @@ -120,6 +120,7 @@ People https://blogs.apache.org/accumulo";>Blog Community Projects + Thanks Governance Bylaws http://git-wip-us.apache.org/repos/asf/accumulo/blob/d52fbf6a/git.html -- diff --git a/git.html b/git.html index 6e70c64..15eaa63 100644 --- a/git.html +++ b/git.html @@ -120,6 +120,7 @@ People https://blogs.apache.org/accumulo";>Blog Community Projects + Thanks Governance Bylaws http://git-wip-us.apache.org/repos/asf/accumulo/blob/d52fbf6a/glossary.html ---
[1/3] accumulo git commit: Add thanks page
Repository: accumulo Updated Branches: refs/heads/asf-site 3af697ac0 -> d52fbf6a4 refs/heads/gh-pages a590d9a67 -> 976bf7f9b Add thanks page Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/976bf7f9 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/976bf7f9 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/976bf7f9 Branch: refs/heads/gh-pages Commit: 976bf7f9b411b707557362a7c077f2d7bf8e16d5 Parents: a590d9a Author: Mike Drob Authored: Fri Jul 1 08:20:14 2016 -0500 Committer: Mike Drob Committed: Tue Jul 5 13:32:34 2016 -0500 -- _includes/nav.html | 1 + thanks.md | 19 +++ 2 files changed, 20 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/976bf7f9/_includes/nav.html -- diff --git a/_includes/nav.html b/_includes/nav.html index a3ee49c..ee2ed08 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -43,6 +43,7 @@ People https://blogs.apache.org/accumulo";>Blog Community Projects + Thanks Governance Bylaws http://git-wip-us.apache.org/repos/asf/accumulo/blob/976bf7f9/thanks.md -- diff --git a/thanks.md b/thanks.md new file mode 100644 index 000..9f2559b --- /dev/null +++ b/thanks.md @@ -0,0 +1,19 @@ +--- +title: Thanks +nav: nav_thanks +--- + +First off, thanks to our parent organization, the [Apache Software Foundation][ASF] and [all who sponsor][ASF_SPONSORS] them. + +Additionally, we would like to thank the following organizations for resources that they provide: + + - ej-technologies for allowing us to use their [Java profiler][JPROFILER] + - YourKit for allowing us use of their [Java Profiler][YOURKIT] + - Coverity for running [static analysis][COVERITY] + +[ASF]: https://www.apache.org +[ASF_SPONSORS]: https://www.apache.org/foundation/sponsorship +[JPROFILER]: https://www.ej-technologies.com/products/jprofiler/overview.html +[YOURKIT]: https://www.yourkit.com/java/profiler/features/ +[COVERITY]: https://scan.coverity.com/projects/accumulo +
[3/3] accumulo git commit: Jekyll build from gh-pages:976bf7f
Jekyll build from gh-pages:976bf7f Add thanks page Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d52fbf6a Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d52fbf6a Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d52fbf6a Branch: refs/heads/asf-site Commit: d52fbf6a4bc7e8d4276337a6be49ad0041e7b151 Parents: 3af697a Author: Mike Drob Authored: Tue Jul 5 13:34:50 2016 -0500 Committer: Mike Drob Committed: Tue Jul 5 13:34:50 2016 -0500 -- 1.4/examples/batch.html | 1 + 1.4/examples/bloom.html | 1 + 1.4/examples/bulkIngest.html| 1 + 1.4/examples/combiner.html | 1 + 1.4/examples/constraints.html | 1 + 1.4/examples/dirlist.html | 1 + 1.4/examples/filedata.html | 1 + 1.4/examples/filter.html| 1 + 1.4/examples/helloworld.html| 1 + 1.4/examples/index.html | 1 + 1.4/examples/isolation.html | 1 + 1.4/examples/mapred.html| 1 + 1.4/examples/shard.html | 1 + 1.4/examples/visibility.html| 1 + 1.4/user_manual/Accumulo_Design.html| 1 + 1.4/user_manual/Accumulo_Shell.html | 1 + 1.4/user_manual/Administration.html | 1 + 1.4/user_manual/Analytics.html | 1 + 1.4/user_manual/Contents.html | 1 + 1.4/user_manual/Development_Clients.html| 1 + 1.4/user_manual/High_Speed_Ingest.html | 1 + 1.4/user_manual/Introduction.html | 1 + 1.4/user_manual/Security.html | 1 + 1.4/user_manual/Shell_Commands.html | 1 + 1.4/user_manual/Table_Configuration.html| 1 + 1.4/user_manual/Table_Design.html | 1 + 1.4/user_manual/Writing_Accumulo_Clients.html | 1 + 1.4/user_manual/accumulo_user_manual.html | 1 + 1.4/user_manual/index.html | 1 + 1.5/examples/batch.html | 1 + 1.5/examples/bloom.html | 1 + 1.5/examples/bulkIngest.html| 1 + 1.5/examples/classpath.html | 1 + 1.5/examples/client.html| 1 + 1.5/examples/combiner.html | 1 + 1.5/examples/constraints.html | 1 + 1.5/examples/dirlist.html | 1 + 1.5/examples/export.html| 1 + 1.5/examples/filedata.html | 1 + 1.5/examples/filter.html| 1 + 1.5/examples/helloworld.html| 1 + 1.5/examples/index.html | 1 + 1.5/examples/isolation.html | 1 + 1.5/examples/mapred.html| 1 + 1.5/examples/maxmutation.html | 1 + 1.5/examples/regex.html | 1 + 1.5/examples/rowhash.html | 1 + 1.5/examples/shard.html | 1 + 1.5/examples/tabletofile.html | 1 + 1.5/examples/terasort.html | 1 + 1.5/examples/visibility.html| 1 + 1.6/examples/batch.html | 1 + 1.6/examples/bloom.html | 1 + 1.6/examples/bulkIngest.html| 1 + 1.6/examples/classpath.html | 1 + 1.6/examples/client.html| 1 + 1.6/examples/combiner.html | 1 + 1.6/examples/constraints.html | 1 + 1.6/examples/dirlist.html | 1 + 1.6/examples/export.html| 1 + 1.6/examples/filedata.html | 1 + 1.6/examples/filter.html| 1 + 1.6/examples/helloworld.html| 1 + 1.6/examples/index.html | 1 + 1.6/examples/isolation.html | 1 + 1.6/examples/mapred.html| 1 + 1.6/examples/maxmutation.html | 1 + 1.6/examples/regex.html | 1 + 1.6/examples/reservations.html | 1 + 1.6/examples/rowhash.html | 1 + 1.6/examples/shard.html | 1 + 1.6/examples/tabletofile.html | 1 + 1.6/examples/terasort.html | 1 + 1.6/examples/visibility.html| 1 + 1.7/examples/batch.html | 1 + 1.7/examples/bloom.html | 1 + 1.7/examples/bulkIngest.html| 1
accumulo git commit: Add JS Runtime for non-OSX installations
Repository: accumulo Updated Branches: refs/heads/gh-pages f30cc51b1 -> 18d95fff5 Add JS Runtime for non-OSX installations Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18d95fff Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18d95fff Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18d95fff Branch: refs/heads/gh-pages Commit: 18d95fff5a798ad162c70f77dfa0dfe4b23f3cd8 Parents: f30cc51 Author: Mike Drob Authored: Thu Jun 23 10:27:49 2016 -0500 Committer: Mike Drob Committed: Thu Jun 23 10:29:20 2016 -0500 -- Gemfile | 1 + Gemfile.lock | 9 + 2 files changed, 10 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/18d95fff/Gemfile -- diff --git a/Gemfile b/Gemfile index 81651d6..6c2f770 100644 --- a/Gemfile +++ b/Gemfile @@ -1,2 +1,3 @@ source 'https://rubygems.org' gem 'github-pages', '78', group: :jekyll_plugins +gem 'therubyracer' http://git-wip-us.apache.org/repos/asf/accumulo/blob/18d95fff/Gemfile.lock -- diff --git a/Gemfile.lock b/Gemfile.lock index a40cdd6..85307f2 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -85,6 +85,7 @@ GEM jekyll (>= 3.0) json (1.8.3) kramdown (1.10.0) +libv8 (3.16.14.15) liquid (3.0.6) listen (3.0.6) rb-fsevent (>= 0.9.3) @@ -102,6 +103,7 @@ GEM rb-fsevent (0.9.7) rb-inotify (0.9.7) ffi (>= 0.5.0) +ref (2.0.0) rouge (1.10.1) safe_yaml (1.0.4) sass (3.4.22) @@ -109,6 +111,9 @@ GEM addressable (>= 2.3.5, < 2.5) faraday (~> 0.8, < 0.10) terminal-table (1.5.2) +therubyracer (0.12.2) + libv8 (~> 3.16.14.0) + ref thread_safe (0.3.5) typhoeus (0.8.0) ethon (>= 0.8.0) @@ -120,3 +125,7 @@ PLATFORMS DEPENDENCIES github-pages (= 78) + therubyracer + +BUNDLED WITH + 1.12.5
accumulo git commit: Add 1.7.2 Release
Repository: accumulo
Updated Branches:
refs/heads/gh-pages 43f42b95c -> a9b0fda04
Add 1.7.2 Release
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a9b0fda0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a9b0fda0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a9b0fda0
Branch: refs/heads/gh-pages
Commit: a9b0fda04b9616439225c9a6c2cad7e936e6d1ab
Parents: 43f42b9
Author: Mike Drob
Authored: Wed Jun 22 15:38:44 2016 -0500
Committer: Mike Drob
Committed: Wed Jun 22 18:25:39 2016 -0500
--
_includes/nav.html | 4 +--
doap_Accumulo.rdf | 7
downloads/index.md | 34 +--
release_notes/1.7.2.md | 80 +
release_notes/index.md | 2 ++
5 files changed, 108 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9b0fda0/_includes/nav.html
--
diff --git a/_includes/nav.html b/_includes/nav.html
index 084618a..a3ee49c 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -15,8 +15,8 @@
Documentation
- 1.7.1 Release (Latest)
- Release Notes
+ 1.7.2 Release (Latest)
+ Release Notes
User
Manual
Javadoc
Examples
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9b0fda0/doap_Accumulo.rdf
--
diff --git a/doap_Accumulo.rdf b/doap_Accumulo.rdf
index bd3fa13..5e51cd6 100644
--- a/doap_Accumulo.rdf
+++ b/doap_Accumulo.rdf
@@ -36,6 +36,13 @@
Apache Accumulo
+2016-06-20
+1.7.2
+
+
+
+
+Apache Accumulo
2016-02-25
1.7.1
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9b0fda0/downloads/index.md
--
diff --git a/downloads/index.md b/downloads/index.md
index da03ba0..28d3cb1 100644
--- a/downloads/index.md
+++ b/downloads/index.md
@@ -90,15 +90,15 @@ Be sure to verify your downloads by these
[procedures][VERIFY_PROCEDURES] using
## Current Releases
-### 1.7.1 **latest**{: .label .label-primary }
+### 1.7.2 **latest**{: .label .label-primary }
-The most recent Apache Accumulo™ release is version 1.7.1. See the
[release notes][REL_NOTES_17] and [CHANGES][CHANGES_17].
+The most recent Apache Accumulo™ release is version 1.7.2. See the
[release notes][REL_NOTES_17] and [CHANGES][CHANGES_17].
For convenience, [MD5][MD5SUM_17] and [SHA1][SHA1SUM_17] hashes are also
available.
{: .table }
-| **Generic Binaries** | [accumulo-1.7.1-bin.tar.gz][BIN_17] |
[ASC][ASC_BIN_17] |
-| **Source** | [accumulo-1.7.1-src.tar.gz][SRC_17] |
[ASC][ASC_SRC_17] |
+| **Generic Binaries** | [accumulo-1.7.2-bin.tar.gz][BIN_17] |
[ASC][ASC_BIN_17] |
+| **Source** | [accumulo-1.7.2-src.tar.gz][SRC_17] |
[ASC][ASC_SRC_17] |
1.7 Documentation
* [README][README_17]
@@ -132,25 +132,25 @@ Older releases can be found in the [archives][ARCHIVES].
[GPG_KEYS]: https://www.apache.org/dist/accumulo/KEYS "KEYS"
[ARCHIVES]: https://archive.apache.org/dist/accumulo
-[ASC_BIN_16]:
https://www.apache.org/dist/accumulo/1.7.1/accumulo-1.7.1-bin.tar.gz.asc
-[ASC_SRC_16]:
https://www.apache.org/dist/accumulo/1.7.1/accumulo-1.7.1-src.tar.gz.asc
+[ASC_BIN_16]:
https://www.apache.org/dist/accumulo/1.6.5/accumulo-1.6.5-bin.tar.gz.asc
+[ASC_SRC_16]:
https://www.apache.org/dist/accumulo/1.6.5/accumulo-1.6.5-src.tar.gz.asc
-[ASC_BIN_17]:
https://www.apache.org/dist/accumulo/1.7.1/accumulo-1.7.1-bin.tar.gz.asc
-[ASC_SRC_17]:
https://www.apache.org/dist/accumulo/1.7.1/accumulo-1.7.1-src.tar.gz.asc
+[ASC_BIN_17]:
https://www.apache.org/dist/accumulo/1.7.2/accumulo-1.7.2-bin.tar.gz.asc
+[ASC_SRC_17]:
https://www.apache.org/dist/accumulo/1.7.2/accumulo-1.7.2-src.tar.gz.asc
[BIN_16]:
https://www.apache.org/dyn/closer.lua/accumulo/1.6.5/accumulo-1.6.5-bin.tar.gz
{: .download_external link-suffix="/accumulo/1.6.5/accumulo-1.6.5-bin.tar.gz"
id="/downloads/accumulo-1.6.5-bin.tar.gz" }
[SRC_16]:
https://www.apache.org/dyn/closer.lua/accumulo/1.6.5/accumulo-1.6.5-src.tar.gz
{: .download_external link-suffix="/accumulo/1.6.5/accumulo-1.6.5-src.tar.gz"
id="/downloads/accumulo-1.6.5-src.tar.gz" }
-[BIN_17]:
https://www.apache.org/dyn/closer.lua/accumulo/1.7.1/accumulo-1.7.1-bin.tar.gz
-{: .download_external link-suffix="/accumulo/1.7.1/accumulo-1.7.1-bin.tar.gz"
id="/downloads/accumulo-1.7.1-bin.tar.gz" }
-[SRC_17]:
https://www.apache.org/dyn/closer.lua/accumulo/1.7.1/accumulo-1.7.1-src.tar.gz
-{: .download_external link-suffix="/accumulo/1.7.1/accumulo-1.7.1-src.tar.gz"
i
svn commit: r14094 - in /release/accumulo: 1.6.4/ 1.7.1/ 1.7.2/ 1.7.2/MD5SUM 1.7.2/SHA1SUM 1.7.2/accumulo-1.7.2-bin.tar.gz 1.7.2/accumulo-1.7.2-bin.tar.gz.asc 1.7.2/accumulo-1.7.2-src.tar.gz 1.7.2/acc
Author: mdrob Date: Wed Jun 22 21:31:29 2016 New Revision: 14094 Log: Add Apache Accumulo 1.7.2 release artifacts Added: release/accumulo/1.7.2/ release/accumulo/1.7.2/MD5SUM release/accumulo/1.7.2/SHA1SUM release/accumulo/1.7.2/accumulo-1.7.2-bin.tar.gz (with props) release/accumulo/1.7.2/accumulo-1.7.2-bin.tar.gz.asc release/accumulo/1.7.2/accumulo-1.7.2-src.tar.gz (with props) release/accumulo/1.7.2/accumulo-1.7.2-src.tar.gz.asc Removed: release/accumulo/1.6.4/ release/accumulo/1.7.1/ Added: release/accumulo/1.7.2/MD5SUM == --- release/accumulo/1.7.2/MD5SUM (added) +++ release/accumulo/1.7.2/MD5SUM Wed Jun 22 21:31:29 2016 @@ -0,0 +1,2 @@ +de876f3f6df4a9659635378ae7df1b86 accumulo-1.7.2-bin.tar.gz +b49d1fe2d85542ad40bd256bc099bfaa accumulo-1.7.2-src.tar.gz Added: release/accumulo/1.7.2/SHA1SUM == --- release/accumulo/1.7.2/SHA1SUM (added) +++ release/accumulo/1.7.2/SHA1SUM Wed Jun 22 21:31:29 2016 @@ -0,0 +1,2 @@ +bda7eb361b361b15756680215da12fa89f1da226 accumulo-1.7.2-bin.tar.gz +f75987a8fc0cb69528d4f48b74922b0012a4567e accumulo-1.7.2-src.tar.gz Added: release/accumulo/1.7.2/accumulo-1.7.2-bin.tar.gz == Binary file - no diff available. Propchange: release/accumulo/1.7.2/accumulo-1.7.2-bin.tar.gz -- svn:mime-type = application/octet-stream Added: release/accumulo/1.7.2/accumulo-1.7.2-bin.tar.gz.asc == --- release/accumulo/1.7.2/accumulo-1.7.2-bin.tar.gz.asc (added) +++ release/accumulo/1.7.2/accumulo-1.7.2-bin.tar.gz.asc Wed Jun 22 21:31:29 2016 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJXZMP3AAoJED5IwMbvNiue+4MQAKvqZ04N5FyUGm1pXsAcpyBB +kbJaF6wzN6d9jFLJHMYfMXObi5iNqcGrUpy/fmyVq0ehsbiyaPoS0uCJQpRbwsZS +CvcmUyWlBr26sgz+Jg5J6oK0Z7WKTNtTFlT07trN1yD81PJCtGhwhFswK/rRmidL +aRS4gxBmTmg9OkXrbji9CSEOEPeCtnB0P/D4tYg+78co3qBubXqPLW9lVQ/tb8z8 +dO0LseKUGQPrf65mlNP46DUK7hFtw8WD0bLBl3piP/RZJOK0cJC4j2o9QHesAH6g +BMIZeANACEC5kt6sejZh9vR2GAY99+DXNURFEyrL95AkYxLAlniYFZgsK+4LL0dc +jV6osikXuTT1edbKSDWBh1UYKSl0nFWjCC+A3E9UayhSfUUhCFgFYQcc0Hi6EDR9 ++iEEZotiHAREnvu0VCVtfWJ6QQasGkUtqucffZRRxK4Pxd7FGhLdFe0OC9niE7rL +aRzqHffL2ZDbfd8zZT/WtAviLN9aYsPWBwhBBEbnTDTzr203CQ1AyVcchkuyJN67 +uzDPc6mcxC1Oko+AKPR8cYkXzgTJouPK1KirEltU0LzVnZ2KFxt6GOIwbtmo6IaF +b8+2xegahxRcv4q5DpjyBhmUdADJ5BosOzVS/C2SBR73Y7xOdN5Oco28sdSgxPmf +Tc5itSjBq9MH33o968L9 +=AK9e +-END PGP SIGNATURE- Added: release/accumulo/1.7.2/accumulo-1.7.2-src.tar.gz == Binary file - no diff available. Propchange: release/accumulo/1.7.2/accumulo-1.7.2-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/accumulo/1.7.2/accumulo-1.7.2-src.tar.gz.asc == --- release/accumulo/1.7.2/accumulo-1.7.2-src.tar.gz.asc (added) +++ release/accumulo/1.7.2/accumulo-1.7.2-src.tar.gz.asc Wed Jun 22 21:31:29 2016 @@ -0,0 +1,17 @@ +-BEGIN PGP SIGNATURE- +Version: GnuPG v1 + +iQIcBAABCgAGBQJXZMP3AAoJED5IwMbvNiueagcP/2M3VJqg6rzlC1V5+0jOwrF9 +SVVa+ZikYPOiiaPfwBuBBKSC80ZFv3+r+Arnj7WbbNN3OX1b+FWoLB3vtLdmQJn3 +oi4Awlyy2V7TZUWPvEHvTAScB1U/I/1eAn4sfBZzdVWkQyWJGSkC13dd6SmufxOo +mb7f+vk/Yi0o+EnsZrF2RoHEQM0damfOKI+Nm6+n8DsC8A6jOg+HZ8DYoz+AqhF+ +R3UP6tPe/5neNbnUI7QrRZOiXMnbDEr1bhA2wvr3Cu+RZHOEtW0P/EC9GEF6CejT +CIjl05eDLoBpPsWqRqKjdXbZaVW5tjMdnIQFADZuGe4PKC8jqzi8tUV9Xe3pL8F9 +EhnzX00FTzQAH0J26hAwIk8636Y575j0ZEA59wdG9JaTQkSuRbT6ypzhym2y1z3B +VbHYsIx7ClajiM/bJAUsGNBguDDBuEVIslIYrxAaed2/U2eVS0ugV4R0eW+UBQwG +RQp0VpB09jhZoPBlLdzCUhQ06H7PhQEOEH6a4A+QKkHO6qqfBab8uhL16uScLl4x +6ismRA/ECuotkTy+RDKdIltW1kI1buaQUCRajLMI5hq94NokKf78XzT3hzWyidOH +mB71yxTyoPd8QAF2waVwdOxzn8FTXwtWoWNgx3j9iAcODMDIRrf43gO68nTYeRNQ +Y+XLBwGnodgXmfEKFwf4 +=Abhf +-END PGP SIGNATURE-
[accumulo] Git Push Summary
Repository: accumulo Updated Tags: refs/tags/rel/1.7.2 [created] 7af3d4757
accumulo git commit: [maven-release-plugin] prepare for next development iteration
Repository: accumulo Updated Branches: refs/heads/1.7.2-rc2 [created] a01e67741 refs/heads/1.7.2-rc2-next [created] 2ac783067 [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2ac78306 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2ac78306 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2ac78306 Branch: refs/heads/1.7.2-rc2-next Commit: 2ac783067232451fde86fd72386c758239c85da2 Parents: a01e677 Author: Mike Drob Authored: Fri Jun 17 22:41:17 2016 -0500 Committer: Mike Drob Committed: Fri Jun 17 22:41:17 2016 -0500 -- assemble/pom.xml| 2 +- core/pom.xml| 2 +- docs/pom.xml| 2 +- examples/simple/pom.xml | 2 +- fate/pom.xml| 2 +- maven-plugin/pom.xml| 2 +- minicluster/pom.xml | 2 +- pom.xml | 4 ++-- proxy/pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml | 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml | 2 +- shell/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml| 2 +- trace/pom.xml | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ac78306/assemble/pom.xml -- diff --git a/assemble/pom.xml b/assemble/pom.xml index fb35a61..1ee64b4 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT accumulo pom http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ac78306/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index d1e9b26..1d0408d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT accumulo-core Apache Accumulo Core http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ac78306/docs/pom.xml -- diff --git a/docs/pom.xml b/docs/pom.xml index 99977e0..b470081 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT accumulo-docs pom http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ac78306/examples/simple/pom.xml -- diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index ae29f62..d0f2216 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT ../../pom.xml accumulo-examples-simple http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ac78306/fate/pom.xml -- diff --git a/fate/pom.xml b/fate/pom.xml index 999ff41..adca357 100644 --- a/fate/pom.xml +++ b/fate/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT accumulo-fate Apache Accumulo Fate http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ac78306/maven-plugin/pom.xml -- diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 19aa2af..66ee5bb 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT accumulo-maven-plugin maven-plugin http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ac78306/minicluster/pom.xml -- diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 18c5760..8822f36 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT accumulo-minicluster Apache Accumulo MiniCluster http://git-wip-us.apache.org/repos/asf/accumulo/blob/2ac78306/pom.xml -- diff --git a/pom.xml b/pom.xml index 9a47a45..2d38882 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project - 1.7.2 + 1.7.3-SNAPSHOT pom Apache Accumulo Project Apache Accumulo is a sorted, distributed key/value store based @@ -103,7 +103,7 @@ scm:git:git://git.apache.org/accumulo.git scm:git:https://git-wip-us.apac
accumulo git commit: [maven-release-plugin] prepare for next development iteration
Repository: accumulo Updated Branches: refs/heads/1.7.2-rc1 [created] a49291b8a refs/heads/1.7.2-rc1-next [created] c22a7f32c [maven-release-plugin] prepare for next development iteration Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c22a7f32 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c22a7f32 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c22a7f32 Branch: refs/heads/1.7.2-rc1-next Commit: c22a7f32c21d02d2fc3dbffd38f931bf20f20597 Parents: a49291b Author: Mike Drob Authored: Tue Jun 14 13:35:54 2016 -0500 Committer: Mike Drob Committed: Tue Jun 14 13:35:54 2016 -0500 -- assemble/pom.xml| 2 +- core/pom.xml| 2 +- docs/pom.xml| 2 +- examples/simple/pom.xml | 2 +- fate/pom.xml| 2 +- maven-plugin/pom.xml| 2 +- minicluster/pom.xml | 2 +- pom.xml | 4 ++-- proxy/pom.xml | 2 +- server/base/pom.xml | 2 +- server/gc/pom.xml | 2 +- server/master/pom.xml | 2 +- server/monitor/pom.xml | 2 +- server/native/pom.xml | 2 +- server/tracer/pom.xml | 2 +- server/tserver/pom.xml | 2 +- shell/pom.xml | 2 +- start/pom.xml | 2 +- test/pom.xml| 2 +- trace/pom.xml | 2 +- 20 files changed, 21 insertions(+), 21 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c22a7f32/assemble/pom.xml -- diff --git a/assemble/pom.xml b/assemble/pom.xml index fb35a61..1ee64b4 100644 --- a/assemble/pom.xml +++ b/assemble/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT accumulo pom http://git-wip-us.apache.org/repos/asf/accumulo/blob/c22a7f32/core/pom.xml -- diff --git a/core/pom.xml b/core/pom.xml index d1e9b26..1d0408d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT accumulo-core Apache Accumulo Core http://git-wip-us.apache.org/repos/asf/accumulo/blob/c22a7f32/docs/pom.xml -- diff --git a/docs/pom.xml b/docs/pom.xml index 99977e0..b470081 100644 --- a/docs/pom.xml +++ b/docs/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT accumulo-docs pom http://git-wip-us.apache.org/repos/asf/accumulo/blob/c22a7f32/examples/simple/pom.xml -- diff --git a/examples/simple/pom.xml b/examples/simple/pom.xml index ae29f62..d0f2216 100644 --- a/examples/simple/pom.xml +++ b/examples/simple/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT ../../pom.xml accumulo-examples-simple http://git-wip-us.apache.org/repos/asf/accumulo/blob/c22a7f32/fate/pom.xml -- diff --git a/fate/pom.xml b/fate/pom.xml index 999ff41..adca357 100644 --- a/fate/pom.xml +++ b/fate/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT accumulo-fate Apache Accumulo Fate http://git-wip-us.apache.org/repos/asf/accumulo/blob/c22a7f32/maven-plugin/pom.xml -- diff --git a/maven-plugin/pom.xml b/maven-plugin/pom.xml index 19aa2af..66ee5bb 100644 --- a/maven-plugin/pom.xml +++ b/maven-plugin/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT accumulo-maven-plugin maven-plugin http://git-wip-us.apache.org/repos/asf/accumulo/blob/c22a7f32/minicluster/pom.xml -- diff --git a/minicluster/pom.xml b/minicluster/pom.xml index 18c5760..8822f36 100644 --- a/minicluster/pom.xml +++ b/minicluster/pom.xml @@ -20,7 +20,7 @@ org.apache.accumulo accumulo-project -1.7.2 +1.7.3-SNAPSHOT accumulo-minicluster Apache Accumulo MiniCluster http://git-wip-us.apache.org/repos/asf/accumulo/blob/c22a7f32/pom.xml -- diff --git a/pom.xml b/pom.xml index 9a47a45..2d38882 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ org.apache.accumulo accumulo-project - 1.7.2 + 1.7.3-SNAPSHOT pom Apache Accumulo Project Apache Accumulo is a sorted, distributed key/value store based @@ -103,7 +103,7 @@ scm:git:git://git.apache.org/accumulo.git scm:git:https://git-wip-us.apac
svn commit: r916631 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/ 1.6/apidocs/
Author: mdrob Date: Fri Jul 18 03:43:16 2014 New Revision: 916631 Log: Publishing svnmucc operation to accumulo site by mdrob Added: websites/production/accumulo/content/ - copied from r916630, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r916630, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r916630, websites/production/accumulo/content/1.5/apidocs/ websites/production/accumulo/content/1.6/apidocs/ - copied from r916630, websites/production/accumulo/content/1.6/apidocs/
svn commit: r916630 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/ 1.6/apidocs/
Author: mdrob Date: Fri Jul 18 03:39:59 2014 New Revision: 916630 Log: Publishing svnmucc operation to accumulo site by mdrob Added: websites/production/accumulo/content/ - copied from r916629, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r916629, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r916629, websites/production/accumulo/content/1.5/apidocs/ websites/production/accumulo/content/1.6/apidocs/ - copied from r916629, websites/production/accumulo/content/1.6/apidocs/
svn commit: r1611536 - /accumulo/site/trunk/content/contrib.mdtext
Author: mdrob Date: Fri Jul 18 03:39:26 2014 New Revision: 1611536 URL: http://svn.apache.org/r1611536 Log: ACCUMULO-1783 removing pig contrib since it is available as part of pig 0.13 Modified: accumulo/site/trunk/content/contrib.mdtext Modified: accumulo/site/trunk/content/contrib.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/contrib.mdtext?rev=1611536&r1=1611535&r2=1611536&view=diff == --- accumulo/site/trunk/content/contrib.mdtext (original) +++ accumulo/site/trunk/content/contrib.mdtext Fri Jul 18 03:39:26 2014 @@ -34,11 +34,6 @@ For details on setting up the applicatio The Apache Accumulo Wikisearch Example uses [Git](http://git-scm.com/) version control ([browse](https://git-wip-us.apache.org/repos/asf?p=accumulo-wikisearch.git;a=summary)|[checkout](https://git-wip-us.apache.org/repos/asf/accumulo-wikisearch.git)). It builds with [Apache Maven](http://maven.apache.org/). See the [section on contributing](#contributing-to-contrib) for instructions on submitting issues and patches. -### Pig Support -A storage module for [Pig](http://pig.apache.org/) allows users to use an Accumulo as either a source or a sink when writing analytics in the Pig scripting language. For details on which Pig version(s) are required to run the storage module, see the project details. - -The Apache Accumulo Pig Module uses [Git](http://git-scm.com/) version control ([browse](https://git-wip-us.apache.org/repos/asf?p=accumulo-pig.git;a=summary)|[checkout](https://git-wip-us.apache.org/repos/asf/accumulo-pig.git)). It builds with [Apache Maven](http://maven.apache.org/). See the [section on contributing](#contributing-to-contrib) for instructions on submitting issues and patches. - ### Hama Integration An implementation for running [Bulk Synchronous Parallel (BSP) algorithms](http://hama.apache.org/hama_bsp_tutorial.html) implemented via [Apache Hama](http://hama.apache.org/) on top of data stored in Accumulo.
git commit: ACCUMULO-2993 fix division by zero
Repository: accumulo
Updated Branches:
refs/heads/master 46f5e8c88 -> e7451ffe9
ACCUMULO-2993 fix division by zero
When given a filename, wc will output that filename, resulting in bad
division as the shell tries to interpret path separators. Instead, we
can have wc read from stdin.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7451ffe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7451ffe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7451ffe
Branch: refs/heads/master
Commit: e7451ffe978da9397a8ee6a6a1a6d62f6d379272
Parents: 46f5e8c
Author: Mike Drob
Authored: Mon Jul 14 18:54:38 2014 -0500
Committer: Mike Drob
Committed: Mon Jul 14 18:54:38 2014 -0500
--
assemble/bin/start-server.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7451ffe/assemble/bin/start-server.sh
--
diff --git a/assemble/bin/start-server.sh b/assemble/bin/start-server.sh
index 2a2d96d..2afabb9 100755
--- a/assemble/bin/start-server.sh
+++ b/assemble/bin/start-server.sh
@@ -40,7 +40,7 @@ SERVICE=$2
LONGNAME=$3
[[ -z $LONGNAME ]] && LONGNAME=$2
-SLAVES=$(wc -l "${ACCUMULO_CONF_DIR}/slaves")
+SLAVES=$(wc -l < "${ACCUMULO_CONF_DIR}/slaves")
IFCONFIG=/sbin/ifconfig
[[ ! -x $IFCONFIG ]] && IFCONFIG='/bin/netstat -ie'
[1/2] ACCUMULO-2423 Clean up shell scripts
Repository: accumulo
Updated Branches:
refs/heads/master eb0cf2f4b -> d40c887b4
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/continuous/stop-scanners.sh
--
diff --git a/test/system/continuous/stop-scanners.sh
b/test/system/continuous/stop-scanners.sh
index 8b1852b..cf927b0 100755
--- a/test/system/continuous/stop-scanners.sh
+++ b/test/system/continuous/stop-scanners.sh
@@ -17,17 +17,17 @@
# Start: Resolve Script Directory
SOURCE="${BASH_SOURCE[0]}"
-while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a
symlink
- bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
- SOURCE="$(readlink "${SOURCE}")"
+while [[ -h "${SOURCE}" ]]; do # resolve $SOURCE until the file is no longer a
symlink
+ bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd )
+ SOURCE=$(readlink "${SOURCE}")
[[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a
relative symlink, we need to resolve it relative to the path where the symlink
file was located
done
-bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
+bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd )
script=$( basename "${SOURCE}" )
# Stop: Resolve Script Directory
CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
-. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. "$CONTINUOUS_CONF_DIR/continuous-env.sh"
-pssh -h $CONTINUOUS_CONF_DIR/scanners.txt "pkill -f
'[o]rg.apache.accumulo.test.continuous.ContinuousScanner'" < /dev/null
+pssh -h "$CONTINUOUS_CONF_DIR/scanners.txt" "pkill -f
'[o]rg.apache.accumulo.test.continuous.ContinuousScanner'" < /dev/null
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/continuous/stop-stats.sh
--
diff --git a/test/system/continuous/stop-stats.sh
b/test/system/continuous/stop-stats.sh
index a806f2d..9886eec 100755
--- a/test/system/continuous/stop-stats.sh
+++ b/test/system/continuous/stop-stats.sh
@@ -17,17 +17,17 @@
# Start: Resolve Script Directory
SOURCE="${BASH_SOURCE[0]}"
-while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a
symlink
- bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
- SOURCE="$(readlink "${SOURCE}")"
+while [[ -h "${SOURCE}" ]]; do # resolve $SOURCE until the file is no longer a
symlink
+ bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd )
+ SOURCE=$(readlink "${SOURCE}")
[[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a
relative symlink, we need to resolve it relative to the path where the symlink
file was located
done
-bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
+bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd )
script=$( basename "${SOURCE}" )
# Stop: Resolve Script Directory
CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
-. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. "$CONTINUOUS_CONF_DIR/continuous-env.sh"
pkill -f org.apache.accumulo.test.continuous.ContinuousStatsCollector
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/continuous/stop-walkers.sh
--
diff --git a/test/system/continuous/stop-walkers.sh
b/test/system/continuous/stop-walkers.sh
index 7e75969..2c22cfa 100755
--- a/test/system/continuous/stop-walkers.sh
+++ b/test/system/continuous/stop-walkers.sh
@@ -17,17 +17,17 @@
# Start: Resolve Script Directory
SOURCE="${BASH_SOURCE[0]}"
-while [ -h "${SOURCE}" ]; do # resolve $SOURCE until the file is no longer a
symlink
- bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
- SOURCE="$(readlink "${SOURCE}")"
+while [[ -h "${SOURCE}" ]]; do # resolve $SOURCE until the file is no longer a
symlink
+ bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd )
+ SOURCE=$(readlink "${SOURCE}")
[[ "${SOURCE}" != /* ]] && SOURCE="${bin}/${SOURCE}" # if $SOURCE was a
relative symlink, we need to resolve it relative to the path where the symlink
file was located
done
-bin="$( cd -P "$( dirname "${SOURCE}" )" && pwd )"
+bin=$( cd -P "$( dirname "${SOURCE}" )" && pwd )
script=$( basename "${SOURCE}" )
# Stop: Resolve Script Directory
CONTINUOUS_CONF_DIR=${CONTINUOUS_CONF_DIR:-${bin}}
-. $CONTINUOUS_CONF_DIR/continuous-env.sh
+. "$CONTINUOUS_CONF_DIR/continuous-env.sh"
-pssh -h $CONTINUOUS_CONF_DIR/walkers.txt "pkill -f
'[o]rg.apache.accumulo.test.continuous.ContinuousWalk'" < /dev/null
+pssh -h "$CONTINUOUS_CONF_DIR/walkers.txt" "pkill -f
'[o]rg.apache.accumulo.test.continuous.ContinuousWalk'" < /dev/null
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d40c887b/test/system/randomwalk/bin/apocalypse.sh
--
diff --git a/test/system/randomwalk/bin/apocalypse.sh
b/test/system/randomwalk/bin/apocalypse.sh
index 899256c..2855a7f 100755
--- a/test/system/randomwalk/bin/apocalypse.sh
+++ b/test/system/randomwalk/bin/apoca
git commit: ACCUMULO-2959 - Configuration for building Accumulo in Travis CI
Repository: accumulo Updated Branches: refs/heads/master 1b89892da -> 90dab1013 ACCUMULO-2959 - Configuration for building Accumulo in Travis CI Signed-off-by: Mike Drob Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/90dab101 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/90dab101 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/90dab101 Branch: refs/heads/master Commit: 90dab10132e13f8d6d29f779ce6907e8495366b4 Parents: 1b89892 Author: Mike Walch Authored: Mon Jun 30 12:36:16 2014 -0400 Committer: Mike Drob Committed: Mon Jun 30 11:50:11 2014 -0500 -- .travis.yml | 18 ++ 1 file changed, 18 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/90dab101/.travis.yml -- diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000..0448150 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,18 @@ +# 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. +language: java +jdk: + - oraclejdk7 +script: mvn package -P assemble
[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/35f618ee Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/35f618ee Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/35f618ee Branch: refs/heads/master Commit: 35f618eee64fff8de43ac5ec14cbb0642d54e1bb Parents: 590b2cf 0a0bdd9 Author: Mike Drob Authored: Wed Jun 25 14:14:45 2014 -0500 Committer: Mike Drob Committed: Wed Jun 25 14:14:45 2014 -0500 -- .../org/apache/accumulo/test/continuous/UndefinedAnalyzer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/35f618ee/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java --
[1/3] git commit: ACCUMULO-2908 use batch scanner opts when parsing
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT cfda8fab6 -> 0a0bdd999
refs/heads/master 590b2cf25 -> 35f618eee
ACCUMULO-2908 use batch scanner opts when parsing
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0a0bdd99
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0a0bdd99
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0a0bdd99
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 0a0bdd999fdd6ca30db4f37e58901dc8116d682e
Parents: cfda8fa
Author: Mike Drob
Authored: Wed Jun 11 15:46:22 2014 -0400
Committer: Mike Drob
Committed: Wed Jun 25 14:14:36 2014 -0500
--
.../org/apache/accumulo/test/continuous/UndefinedAnalyzer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0a0bdd99/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
--
diff --git
a/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
b/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
index ab75632..4bd07ca 100644
---
a/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
+++
b/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
@@ -256,7 +256,7 @@ public class UndefinedAnalyzer {
public static void main(String[] args) throws Exception {
Opts opts = new Opts();
BatchScannerOpts bsOpts = new BatchScannerOpts();
-opts.parseArgs(UndefinedAnalyzer.class.getName(), args, opts);
+opts.parseArgs(UndefinedAnalyzer.class.getName(), args, bsOpts);
List undefs = new ArrayList();
[2/3] git commit: ACCUMULO-2908 use batch scanner opts when parsing
ACCUMULO-2908 use batch scanner opts when parsing
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0a0bdd99
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0a0bdd99
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0a0bdd99
Branch: refs/heads/master
Commit: 0a0bdd999fdd6ca30db4f37e58901dc8116d682e
Parents: cfda8fa
Author: Mike Drob
Authored: Wed Jun 11 15:46:22 2014 -0400
Committer: Mike Drob
Committed: Wed Jun 25 14:14:36 2014 -0500
--
.../org/apache/accumulo/test/continuous/UndefinedAnalyzer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0a0bdd99/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
--
diff --git
a/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
b/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
index ab75632..4bd07ca 100644
---
a/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
+++
b/test/src/main/java/org/apache/accumulo/test/continuous/UndefinedAnalyzer.java
@@ -256,7 +256,7 @@ public class UndefinedAnalyzer {
public static void main(String[] args) throws Exception {
Opts opts = new Opts();
BatchScannerOpts bsOpts = new BatchScannerOpts();
-opts.parseArgs(UndefinedAnalyzer.class.getName(), args, opts);
+opts.parseArgs(UndefinedAnalyzer.class.getName(), args, bsOpts);
List undefs = new ArrayList();
[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT'
Conflicts:
core/src/main/java/org/apache/accumulo/core/Constants.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/7e01de52
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7e01de52
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7e01de52
Branch: refs/heads/master
Commit: 7e01de52492149aaac14d6d02a5964d15cd19480
Parents: bc7b5ff 3fafd23
Author: Mike Drob
Authored: Thu Jun 19 10:30:49 2014 -0500
Committer: Mike Drob
Committed: Thu Jun 19 10:30:49 2014 -0500
--
core/src/main/java/org/apache/accumulo/core/Constants.java | 6 +-
.../main/java/org/apache/accumulo/core/conf/PropertyType.java | 3 +--
2 files changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7e01de52/core/src/main/java/org/apache/accumulo/core/Constants.java
--
diff --cc core/src/main/java/org/apache/accumulo/core/Constants.java
index 2e213d8,15cccf4..76b86d4
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@@ -16,6 -16,11 +16,10 @@@
*/
package org.apache.accumulo.core;
-import java.nio.charset.Charset;
+ import java.util.Arrays;
+ import java.util.Collection;
+ import java.util.Collections;
+
import org.apache.accumulo.core.security.Authorizations;
public class Constants {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/7e01de52/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
--
[1/3] git commit: ACCUMULO-2896 Make PATH_PROPERTY_ENV_VARS final
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT 93574178c -> 3fafd2381
refs/heads/master bc7b5ff37 -> 7e01de524
ACCUMULO-2896 Make PATH_PROPERTY_ENV_VARS final
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3fafd238
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3fafd238
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3fafd238
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 3fafd23812775decaa9e74c4a7450bda94956e9e
Parents: 9357417
Author: Mike Drob
Authored: Wed Jun 11 15:42:58 2014 -0400
Committer: Mike Drob
Committed: Thu Jun 19 10:27:53 2014 -0500
--
core/src/main/java/org/apache/accumulo/core/Constants.java | 5 -
.../main/java/org/apache/accumulo/core/conf/PropertyType.java | 3 +--
2 files changed, 5 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fafd238/core/src/main/java/org/apache/accumulo/core/Constants.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java
b/core/src/main/java/org/apache/accumulo/core/Constants.java
index c9a51a9..15cccf4 100644
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@ -17,6 +17,9 @@
package org.apache.accumulo.core;
import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import org.apache.accumulo.core.security.Authorizations;
@@ -112,7 +115,7 @@ public class Constants {
public static final String EXPORT_INFO_FILE = "accumulo_export_info.txt";
// Variables that will be substituted with environment vars in
PropertyType.PATH values
- public static final String[] PATH_PROPERTY_ENV_VARS = new String[]
{"ACCUMULO_HOME", "ACCUMULO_CONF_DIR"};
+ public static final Collection PATH_PROPERTY_ENV_VARS =
Collections.unmodifiableCollection(Arrays.asList("ACCUMULO_HOME",
"ACCUMULO_CONF_DIR"));
public static final String HDFS_TABLES_DIR = "/tables";
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fafd238/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 60812d6..3d381a0 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.core.conf;
-import java.util.Arrays;
import java.util.regex.Pattern;
import org.apache.accumulo.core.Constants;
@@ -52,7 +51,7 @@ public enum PropertyType {
PATH("path", ".*",
"A string that represents a filesystem path, which can be either
relative or absolute to some directory. The filesystem depends on the property.
The "
- + "following environment variables will be substituted: " +
Arrays.asList(Constants.PATH_PROPERTY_ENV_VARS)), ABSOLUTEPATH("absolute path",
null,
+ + "following environment variables will be substituted: " +
Constants.PATH_PROPERTY_ENV_VARS), ABSOLUTEPATH("absolute path", null,
"An absolute filesystem path. The filesystem depends on the property.
This is the same as path, but enforces that its root is explicitly specified.")
{
@Override
public boolean isValidFormat(String value) {
[2/3] git commit: ACCUMULO-2896 Make PATH_PROPERTY_ENV_VARS final
ACCUMULO-2896 Make PATH_PROPERTY_ENV_VARS final
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3fafd238
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3fafd238
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3fafd238
Branch: refs/heads/master
Commit: 3fafd23812775decaa9e74c4a7450bda94956e9e
Parents: 9357417
Author: Mike Drob
Authored: Wed Jun 11 15:42:58 2014 -0400
Committer: Mike Drob
Committed: Thu Jun 19 10:27:53 2014 -0500
--
core/src/main/java/org/apache/accumulo/core/Constants.java | 5 -
.../main/java/org/apache/accumulo/core/conf/PropertyType.java | 3 +--
2 files changed, 5 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fafd238/core/src/main/java/org/apache/accumulo/core/Constants.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java
b/core/src/main/java/org/apache/accumulo/core/Constants.java
index c9a51a9..15cccf4 100644
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@ -17,6 +17,9 @@
package org.apache.accumulo.core;
import java.nio.charset.Charset;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
import org.apache.accumulo.core.security.Authorizations;
@@ -112,7 +115,7 @@ public class Constants {
public static final String EXPORT_INFO_FILE = "accumulo_export_info.txt";
// Variables that will be substituted with environment vars in
PropertyType.PATH values
- public static final String[] PATH_PROPERTY_ENV_VARS = new String[]
{"ACCUMULO_HOME", "ACCUMULO_CONF_DIR"};
+ public static final Collection PATH_PROPERTY_ENV_VARS =
Collections.unmodifiableCollection(Arrays.asList("ACCUMULO_HOME",
"ACCUMULO_CONF_DIR"));
public static final String HDFS_TABLES_DIR = "/tables";
http://git-wip-us.apache.org/repos/asf/accumulo/blob/3fafd238/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 60812d6..3d381a0 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.core.conf;
-import java.util.Arrays;
import java.util.regex.Pattern;
import org.apache.accumulo.core.Constants;
@@ -52,7 +51,7 @@ public enum PropertyType {
PATH("path", ".*",
"A string that represents a filesystem path, which can be either
relative or absolute to some directory. The filesystem depends on the property.
The "
- + "following environment variables will be substituted: " +
Arrays.asList(Constants.PATH_PROPERTY_ENV_VARS)), ABSOLUTEPATH("absolute path",
null,
+ + "following environment variables will be substituted: " +
Constants.PATH_PROPERTY_ENV_VARS), ABSOLUTEPATH("absolute path", null,
"An absolute filesystem path. The filesystem depends on the property.
This is the same as path, but enforces that its root is explicitly specified.")
{
@Override
public boolean isValidFormat(String value) {
[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Conflicts:
core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46931060
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46931060
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46931060
Branch: refs/heads/master
Commit: 46931060631de41a55b4df7eec5ecdee8779ceb0
Parents: dda7a60 e6171e6
Author: Mike Drob
Authored: Fri Jun 13 14:37:37 2014 -0400
Committer: Mike Drob
Committed: Fri Jun 13 14:37:37 2014 -0400
--
.../accumulo/core/util/shell/ShellTest.java | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/46931060/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
--
diff --cc core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
index 3d9b89e,610caf1..87eea7a
--- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
@@@ -24,16 -25,12 +24,18 @@@ import java.io.InputStream
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+ import java.util.Arrays;
+import java.util.Date;
+ import java.util.List;
+import java.util.TimeZone;
-import jline.ConsoleReader;
+import jline.console.ConsoleReader;
+import org.apache.accumulo.core.util.format.DateStringFormatter;
import org.apache.log4j.Level;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@@ -54,29 -51,23 +56,42 @@@ public class ShellTest
sb.setLength(0);
}
}
-
+
+ public static class StringInputStream extends InputStream {
+private String source = "";
+private int offset = 0;
+
+@Override
+public int read() throws IOException {
+ if (offset == source.length())
+return '\n';
+ else
+return source.charAt(offset++);
+}
+
+public void set(String other) {
+ source = other;
+ offset = 0;
+}
+ }
+
+ private StringInputStream input;
private TestOutputStream output;
private Shell shell;
-
+
+ void execExpectList(String cmd, boolean expecteGoodExit, List
expectedStrings) throws IOException {
+ exec(cmd);
+ if (expecteGoodExit) {
+ assertGoodExit("", true);
+ } else {
+ assertBadExit("", true);
+ }
+
+ for (String expectedString : expectedStrings) {
+ assertTrue(expectedString + " was not present in " + output.get(),
output.get().contains(expectedString));
+ }
+ }
+
void exec(String cmd) throws IOException {
output.clear();
shell.execCommand(cmd, true, true);
@@@ -182,16 -166,16 +197,16 @@@
Shell.log.debug("Starting auths test --");
exec("setauths x,y,z", false, "Missing required option");
exec("setauths -s x,y,z -u notauser", false, "user does not exist");
-exec("setauths -s x,y,z", true);
+exec("setauths -s y,z,x", true);
exec("getauths -u notauser", false, "user does not exist");
- exec("getauths", true, "x,y,z");
+ execExpectList("getauths", true, Arrays.asList("x", "y", "z"));
exec("addauths -u notauser", false, "Missing required option");
exec("addauths -u notauser -s foo", false, "user does not exist");
exec("addauths -s a", true);
- exec("getauths", true, "a,x,y,z");
+ execExpectList("getauths", true, Arrays.asList("x", "y", "z", "a"));
exec("setauths -c", true);
}
-
+
@Test
public void userTest() throws Exception {
Shell.log.debug("Starting user test --");
[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Conflicts:
core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/46931060
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/46931060
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/46931060
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 46931060631de41a55b4df7eec5ecdee8779ceb0
Parents: dda7a60 e6171e6
Author: Mike Drob
Authored: Fri Jun 13 14:37:37 2014 -0400
Committer: Mike Drob
Committed: Fri Jun 13 14:37:37 2014 -0400
--
.../accumulo/core/util/shell/ShellTest.java | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/46931060/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
--
diff --cc core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
index 3d9b89e,610caf1..87eea7a
--- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
@@@ -24,16 -25,12 +24,18 @@@ import java.io.InputStream
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+ import java.util.Arrays;
+import java.util.Date;
+ import java.util.List;
+import java.util.TimeZone;
-import jline.ConsoleReader;
+import jline.console.ConsoleReader;
+import org.apache.accumulo.core.util.format.DateStringFormatter;
import org.apache.log4j.Level;
+import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@@ -54,29 -51,23 +56,42 @@@ public class ShellTest
sb.setLength(0);
}
}
-
+
+ public static class StringInputStream extends InputStream {
+private String source = "";
+private int offset = 0;
+
+@Override
+public int read() throws IOException {
+ if (offset == source.length())
+return '\n';
+ else
+return source.charAt(offset++);
+}
+
+public void set(String other) {
+ source = other;
+ offset = 0;
+}
+ }
+
+ private StringInputStream input;
private TestOutputStream output;
private Shell shell;
-
+
+ void execExpectList(String cmd, boolean expecteGoodExit, List
expectedStrings) throws IOException {
+ exec(cmd);
+ if (expecteGoodExit) {
+ assertGoodExit("", true);
+ } else {
+ assertBadExit("", true);
+ }
+
+ for (String expectedString : expectedStrings) {
+ assertTrue(expectedString + " was not present in " + output.get(),
output.get().contains(expectedString));
+ }
+ }
+
void exec(String cmd) throws IOException {
output.clear();
shell.execCommand(cmd, true, true);
@@@ -182,16 -166,16 +197,16 @@@
Shell.log.debug("Starting auths test --");
exec("setauths x,y,z", false, "Missing required option");
exec("setauths -s x,y,z -u notauser", false, "user does not exist");
-exec("setauths -s x,y,z", true);
+exec("setauths -s y,z,x", true);
exec("getauths -u notauser", false, "user does not exist");
- exec("getauths", true, "x,y,z");
+ execExpectList("getauths", true, Arrays.asList("x", "y", "z"));
exec("addauths -u notauser", false, "Missing required option");
exec("addauths -u notauser -s foo", false, "user does not exist");
exec("addauths -s a", true);
- exec("getauths", true, "a,x,y,z");
+ execExpectList("getauths", true, Arrays.asList("x", "y", "z", "a"));
exec("setauths -c", true);
}
-
+
@Test
public void userTest() throws Exception {
Shell.log.debug("Starting user test --");
[2/6] git commit: ACCUMULO-2549 Fixes ShellTest
ACCUMULO-2549 Fixes ShellTest
Authorizations were coming back from getauths in an unexpected
order. This patch changes the test to expect not a specific
string a but a list of expected authorization entries.
Signed-off-by: Mike Drob
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e6171e6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6171e6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e6171e6b
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: e6171e6b2a293ac5561e20147e005df2d0e6c06a
Parents: edfc56b
Author: Michael Allen
Authored: Tue Mar 25 13:46:11 2014 -0400
Committer: Mike Drob
Committed: Fri Jun 13 12:53:11 2014 -0400
--
.../accumulo/core/util/shell/ShellTest.java | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e6171e6b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
index 8505370..610caf1 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
@@ -25,6 +25,8 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.List;
import jline.ConsoleReader;
@@ -53,6 +55,19 @@ public class ShellTest {
private TestOutputStream output;
private Shell shell;
+ void execExpectList(String cmd, boolean expecteGoodExit, List
expectedStrings) throws IOException {
+exec(cmd);
+if (expecteGoodExit) {
+ assertGoodExit("", true);
+} else {
+ assertBadExit("", true);
+}
+
+for (String expectedString : expectedStrings) {
+ assertTrue(expectedString + " was not present in " + output.get(),
output.get().contains(expectedString));
+}
+ }
+
void exec(String cmd) throws IOException {
output.clear();
shell.execCommand(cmd, true, true);
@@ -153,11 +168,11 @@ public class ShellTest {
exec("setauths -s x,y,z -u notauser", false, "user does not exist");
exec("setauths -s x,y,z", true);
exec("getauths -u notauser", false, "user does not exist");
-exec("getauths", true, "y,z,x");
+execExpectList("getauths", true, Arrays.asList("x", "y", "z"));
exec("addauths -u notauser", false, "Missing required option");
exec("addauths -u notauser -s foo", false, "user does not exist");
exec("addauths -s a", true);
-exec("getauths", true, "y,z,a,x");
+execExpectList("getauths", true, Arrays.asList("x", "y", "z", "a"));
exec("setauths -c", true);
}
[3/6] git commit: ACCUMULO-2549 Fixes ShellTest
ACCUMULO-2549 Fixes ShellTest
Authorizations were coming back from getauths in an unexpected
order. This patch changes the test to expect not a specific
string a but a list of expected authorization entries.
Signed-off-by: Mike Drob
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e6171e6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6171e6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e6171e6b
Branch: refs/heads/master
Commit: e6171e6b2a293ac5561e20147e005df2d0e6c06a
Parents: edfc56b
Author: Michael Allen
Authored: Tue Mar 25 13:46:11 2014 -0400
Committer: Mike Drob
Committed: Fri Jun 13 12:53:11 2014 -0400
--
.../accumulo/core/util/shell/ShellTest.java | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e6171e6b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
index 8505370..610caf1 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
@@ -25,6 +25,8 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.List;
import jline.ConsoleReader;
@@ -53,6 +55,19 @@ public class ShellTest {
private TestOutputStream output;
private Shell shell;
+ void execExpectList(String cmd, boolean expecteGoodExit, List
expectedStrings) throws IOException {
+exec(cmd);
+if (expecteGoodExit) {
+ assertGoodExit("", true);
+} else {
+ assertBadExit("", true);
+}
+
+for (String expectedString : expectedStrings) {
+ assertTrue(expectedString + " was not present in " + output.get(),
output.get().contains(expectedString));
+}
+ }
+
void exec(String cmd) throws IOException {
output.clear();
shell.execCommand(cmd, true, true);
@@ -153,11 +168,11 @@ public class ShellTest {
exec("setauths -s x,y,z -u notauser", false, "user does not exist");
exec("setauths -s x,y,z", true);
exec("getauths -u notauser", false, "user does not exist");
-exec("getauths", true, "y,z,x");
+execExpectList("getauths", true, Arrays.asList("x", "y", "z"));
exec("addauths -u notauser", false, "Missing required option");
exec("addauths -u notauser -s foo", false, "user does not exist");
exec("addauths -s a", true);
-exec("getauths", true, "y,z,a,x");
+execExpectList("getauths", true, Arrays.asList("x", "y", "z", "a"));
exec("setauths -c", true);
}
[6/6] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a32b9262
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a32b9262
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a32b9262
Branch: refs/heads/master
Commit: a32b9262855f1fae911b9c72b8cd972dd34df893
Parents: 1392992 4693106
Author: Mike Drob
Authored: Fri Jun 13 14:49:21 2014 -0400
Committer: Mike Drob
Committed: Fri Jun 13 14:49:21 2014 -0400
--
.../org/apache/accumulo/shell/ShellTest.java | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a32b9262/shell/src/test/java/org/apache/accumulo/shell/ShellTest.java
--
diff --cc shell/src/test/java/org/apache/accumulo/shell/ShellTest.java
index ef12baa,000..2ce8ed6
mode 100644,00..100644
--- a/shell/src/test/java/org/apache/accumulo/shell/ShellTest.java
+++ b/shell/src/test/java/org/apache/accumulo/shell/ShellTest.java
@@@ -1,282 -1,0 +1,297 @@@
+/*
+ * 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.shell;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
++import java.util.Arrays;
+import java.util.Date;
++import java.util.List;
+import java.util.TimeZone;
+
+import jline.console.ConsoleReader;
+
+import org.apache.accumulo.core.util.format.DateStringFormatter;
+import org.apache.accumulo.shell.Shell;
+import org.apache.log4j.Level;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+public class ShellTest {
+ public static class TestOutputStream extends OutputStream {
+StringBuilder sb = new StringBuilder();
+
+@Override
+public void write(int b) throws IOException {
+ sb.append((char) (0xff & b));
+}
+
+public String get() {
+ return sb.toString();
+}
+
+public void clear() {
+ sb.setLength(0);
+}
+ }
+
+ public static class StringInputStream extends InputStream {
+private String source = "";
+private int offset = 0;
+
+@Override
+public int read() throws IOException {
+ if (offset == source.length())
+return '\n';
+ else
+return source.charAt(offset++);
+}
+
+public void set(String other) {
+ source = other;
+ offset = 0;
+}
+ }
+
+ private StringInputStream input;
+ private TestOutputStream output;
+ private Shell shell;
+
++ void execExpectList(String cmd, boolean expecteGoodExit, List
expectedStrings) throws IOException {
++exec(cmd);
++if (expecteGoodExit) {
++ assertGoodExit("", true);
++} else {
++ assertBadExit("", true);
++}
++
++for (String expectedString : expectedStrings) {
++ assertTrue(expectedString + " was not present in " + output.get(),
output.get().contains(expectedString));
++}
++ }
++
+ void exec(String cmd) throws IOException {
+output.clear();
+shell.execCommand(cmd, true, true);
+ }
+
+ void exec(String cmd, boolean expectGoodExit) throws IOException {
+exec(cmd);
+if (expectGoodExit)
+ assertGoodExit("", true);
+else
+ assertBadExit("", true);
+ }
+
+ void exec(String cmd, boolean expectGoodExit, String expectString) throws
IOException {
+exec(cmd, expectGoodExit, expectString, true);
+ }
+
+ void exec(String cmd, boolean expectGoodExit, String expectString, boolean
stringPresent) throws IOException {
+exec(cmd);
+if (expectGoodExit)
+ assertGoodExit(expectString, stringPresent);
+else
+ assertBadExit(expectString, stringPresent);
+ }
+
+ @Before
+ public void setup() throws
[1/6] git commit: ACCUMULO-2549 Fixes ShellTest
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT edfc56bc1 -> e6171e6b2
refs/heads/1.6.1-SNAPSHOT dda7a605a -> 469310606
refs/heads/master 1392992bd -> a32b92628
ACCUMULO-2549 Fixes ShellTest
Authorizations were coming back from getauths in an unexpected
order. This patch changes the test to expect not a specific
string a but a list of expected authorization entries.
Signed-off-by: Mike Drob
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e6171e6b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e6171e6b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e6171e6b
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: e6171e6b2a293ac5561e20147e005df2d0e6c06a
Parents: edfc56b
Author: Michael Allen
Authored: Tue Mar 25 13:46:11 2014 -0400
Committer: Mike Drob
Committed: Fri Jun 13 12:53:11 2014 -0400
--
.../accumulo/core/util/shell/ShellTest.java | 19 +--
1 file changed, 17 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/e6171e6b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
index 8505370..610caf1 100644
--- a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellTest.java
@@ -25,6 +25,8 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
+import java.util.Arrays;
+import java.util.List;
import jline.ConsoleReader;
@@ -53,6 +55,19 @@ public class ShellTest {
private TestOutputStream output;
private Shell shell;
+ void execExpectList(String cmd, boolean expecteGoodExit, List
expectedStrings) throws IOException {
+exec(cmd);
+if (expecteGoodExit) {
+ assertGoodExit("", true);
+} else {
+ assertBadExit("", true);
+}
+
+for (String expectedString : expectedStrings) {
+ assertTrue(expectedString + " was not present in " + output.get(),
output.get().contains(expectedString));
+}
+ }
+
void exec(String cmd) throws IOException {
output.clear();
shell.execCommand(cmd, true, true);
@@ -153,11 +168,11 @@ public class ShellTest {
exec("setauths -s x,y,z -u notauser", false, "user does not exist");
exec("setauths -s x,y,z", true);
exec("getauths -u notauser", false, "user does not exist");
-exec("getauths", true, "y,z,x");
+execExpectList("getauths", true, Arrays.asList("x", "y", "z"));
exec("addauths -u notauser", false, "Missing required option");
exec("addauths -u notauser -s foo", false, "user does not exist");
exec("addauths -s a", true);
-exec("getauths", true, "y,z,a,x");
+execExpectList("getauths", true, Arrays.asList("x", "y", "z", "a"));
exec("setauths -c", true);
}
[1/6] git commit: ACCUMULO-2253 Add quartiles to scalability test results
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT b664f51d8 -> edfc56bc1
refs/heads/1.6.1-SNAPSHOT 8b2f2dce8 -> dda7a605a
refs/heads/master 668c9e3a8 -> 1392992bd
ACCUMULO-2253 Add quartiles to scalability test results
Signed-off-by: Mike Drob
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/edfc56bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/edfc56bc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/edfc56bc
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: edfc56bc146914c6ffc0dc01509498fe58a1fce7
Parents: b664f51
Author: Vikram Srivastava
Authored: Wed Jan 29 09:28:10 2014 -0800
Committer: Mike Drob
Committed: Fri Jun 13 11:27:55 2014 -0400
--
test/system/scalability/run.py | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/edfc56bc/test/system/scalability/run.py
--
diff --git a/test/system/scalability/run.py b/test/system/scalability/run.py
index df86545..5544234 100755
--- a/test/system/scalability/run.py
+++ b/test/system/scalability/run.py
@@ -140,10 +140,13 @@ def runTest(testName, siteConfig, testDir, numNodes,
fdata):
avg = (float(totalMs) / numClients) / 1000
median = times[int(numClients/2)] / 1000
max = times[numClients-1] / 1000
+q1 = times[int(numClients/4)] / 1000
+q3 = times[int((3*numClients)/4)] / 1000
-log('Tservs\tClients\tMin\tAvg\tMed\tMax\tEntries\tMB')
-log('%d\t%d\t%d\t%d\t%d\t%d\t%dM\t%d' % (numNodes, numClients, min, avg,
median, max, totalEntries / 100, totalBytes / 100))
-fdata.write('%d\t%d\t%d\t%d\t%d\t%d\t%dM\t%d\n' % (numNodes, numClients,
min, avg, median, max, totalEntries / 100, totalBytes / 100))
+log('Tservs\tClients\tMin\tQ1\tAvg\tMed\tQ3\tMax\tEntries\tMB')
+resultStr = '%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%dM\t%d' % (numNodes,
numClients, min, q1, avg, median, q3, max, totalEntries / 100, totalBytes /
100)
+log(resultStr)
+fdata.write(resultStr + '\n')
fdata.flush()
time.sleep(5)
[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dda7a605 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dda7a605 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dda7a605 Branch: refs/heads/1.6.1-SNAPSHOT Commit: dda7a605a0179596b9fcc16b9e1ab533ac231c8e Parents: 8b2f2dc edfc56b Author: Mike Drob Authored: Fri Jun 13 11:29:09 2014 -0400 Committer: Mike Drob Committed: Fri Jun 13 11:29:09 2014 -0400 -- test/system/scalability/run.py | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) --
[2/6] git commit: ACCUMULO-2253 Add quartiles to scalability test results
ACCUMULO-2253 Add quartiles to scalability test results
Signed-off-by: Mike Drob
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/edfc56bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/edfc56bc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/edfc56bc
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: edfc56bc146914c6ffc0dc01509498fe58a1fce7
Parents: b664f51
Author: Vikram Srivastava
Authored: Wed Jan 29 09:28:10 2014 -0800
Committer: Mike Drob
Committed: Fri Jun 13 11:27:55 2014 -0400
--
test/system/scalability/run.py | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/edfc56bc/test/system/scalability/run.py
--
diff --git a/test/system/scalability/run.py b/test/system/scalability/run.py
index df86545..5544234 100755
--- a/test/system/scalability/run.py
+++ b/test/system/scalability/run.py
@@ -140,10 +140,13 @@ def runTest(testName, siteConfig, testDir, numNodes,
fdata):
avg = (float(totalMs) / numClients) / 1000
median = times[int(numClients/2)] / 1000
max = times[numClients-1] / 1000
+q1 = times[int(numClients/4)] / 1000
+q3 = times[int((3*numClients)/4)] / 1000
-log('Tservs\tClients\tMin\tAvg\tMed\tMax\tEntries\tMB')
-log('%d\t%d\t%d\t%d\t%d\t%d\t%dM\t%d' % (numNodes, numClients, min, avg,
median, max, totalEntries / 100, totalBytes / 100))
-fdata.write('%d\t%d\t%d\t%d\t%d\t%d\t%dM\t%d\n' % (numNodes, numClients,
min, avg, median, max, totalEntries / 100, totalBytes / 100))
+log('Tservs\tClients\tMin\tQ1\tAvg\tMed\tQ3\tMax\tEntries\tMB')
+resultStr = '%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%dM\t%d' % (numNodes,
numClients, min, q1, avg, median, q3, max, totalEntries / 100, totalBytes /
100)
+log(resultStr)
+fdata.write(resultStr + '\n')
fdata.flush()
time.sleep(5)
[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/dda7a605 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/dda7a605 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/dda7a605 Branch: refs/heads/master Commit: dda7a605a0179596b9fcc16b9e1ab533ac231c8e Parents: 8b2f2dc edfc56b Author: Mike Drob Authored: Fri Jun 13 11:29:09 2014 -0400 Committer: Mike Drob Committed: Fri Jun 13 11:29:09 2014 -0400 -- test/system/scalability/run.py | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) --
[3/6] git commit: ACCUMULO-2253 Add quartiles to scalability test results
ACCUMULO-2253 Add quartiles to scalability test results
Signed-off-by: Mike Drob
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/edfc56bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/edfc56bc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/edfc56bc
Branch: refs/heads/master
Commit: edfc56bc146914c6ffc0dc01509498fe58a1fce7
Parents: b664f51
Author: Vikram Srivastava
Authored: Wed Jan 29 09:28:10 2014 -0800
Committer: Mike Drob
Committed: Fri Jun 13 11:27:55 2014 -0400
--
test/system/scalability/run.py | 9 ++---
1 file changed, 6 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/edfc56bc/test/system/scalability/run.py
--
diff --git a/test/system/scalability/run.py b/test/system/scalability/run.py
index df86545..5544234 100755
--- a/test/system/scalability/run.py
+++ b/test/system/scalability/run.py
@@ -140,10 +140,13 @@ def runTest(testName, siteConfig, testDir, numNodes,
fdata):
avg = (float(totalMs) / numClients) / 1000
median = times[int(numClients/2)] / 1000
max = times[numClients-1] / 1000
+q1 = times[int(numClients/4)] / 1000
+q3 = times[int((3*numClients)/4)] / 1000
-log('Tservs\tClients\tMin\tAvg\tMed\tMax\tEntries\tMB')
-log('%d\t%d\t%d\t%d\t%d\t%d\t%dM\t%d' % (numNodes, numClients, min, avg,
median, max, totalEntries / 100, totalBytes / 100))
-fdata.write('%d\t%d\t%d\t%d\t%d\t%d\t%dM\t%d\n' % (numNodes, numClients,
min, avg, median, max, totalEntries / 100, totalBytes / 100))
+log('Tservs\tClients\tMin\tQ1\tAvg\tMed\tQ3\tMax\tEntries\tMB')
+resultStr = '%d\t%d\t%d\t%d\t%d\t%d\t%d\t%d\t%dM\t%d' % (numNodes,
numClients, min, q1, avg, median, q3, max, totalEntries / 100, totalBytes /
100)
+log(resultStr)
+fdata.write(resultStr + '\n')
fdata.flush()
time.sleep(5)
[6/6] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1392992b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1392992b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1392992b Branch: refs/heads/master Commit: 1392992bd313075aadb11dffd912ce5084649080 Parents: 668c9e3 dda7a60 Author: Mike Drob Authored: Fri Jun 13 11:32:08 2014 -0400 Committer: Mike Drob Committed: Fri Jun 13 11:32:08 2014 -0400 -- test/system/scalability/run.py | 9 ++--- 1 file changed, 6 insertions(+), 3 deletions(-) --
[2/3] git commit: ACCUMULO-2891 check for masters file before grep
ACCUMULO-2891 check for masters file before grep
Check that file exists
Before we try to open it
Be one with all things
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b170e8e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1b170e8e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1b170e8e
Branch: refs/heads/master
Commit: 1b170e8e5b416720ff67df85adfd2c2eac3ffab5
Parents: d50bb3a
Author: Mike Drob
Authored: Wed Jun 11 10:17:38 2014 -0400
Committer: Mike Drob
Committed: Wed Jun 11 11:52:35 2014 -0400
--
bin/config.sh | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b170e8e/bin/config.sh
--
diff --git a/bin/config.sh b/bin/config.sh
index 931ec8b..7663473 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -115,7 +115,11 @@ then
fi
export HADOOP_PREFIX
-MASTER1=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters" | head -1)
+unset MASTER1
+if [[ -f "$ACCUMULO_CONF_DIR/masters" ]]; then
+ MASTER1=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters" | head -1)
+fi
+
if [ -z "${MONITOR}" ] ; then
MONITOR=$MASTER1
if [ -f "$ACCUMULO_CONF_DIR/monitor" ]; then
[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/97cac218 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/97cac218 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/97cac218 Branch: refs/heads/master Commit: 97cac218c388af359d51544493a0580be0252a8b Parents: 9fcaace 1b170e8 Author: Mike Drob Authored: Wed Jun 11 11:52:48 2014 -0400 Committer: Mike Drob Committed: Wed Jun 11 11:52:48 2014 -0400 -- bin/config.sh | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) --
[1/3] git commit: ACCUMULO-2891 check for masters file before grep
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT d50bb3a21 -> 1b170e8e5
refs/heads/master 9fcaace81 -> 97cac218c
ACCUMULO-2891 check for masters file before grep
Check that file exists
Before we try to open it
Be one with all things
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1b170e8e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1b170e8e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1b170e8e
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 1b170e8e5b416720ff67df85adfd2c2eac3ffab5
Parents: d50bb3a
Author: Mike Drob
Authored: Wed Jun 11 10:17:38 2014 -0400
Committer: Mike Drob
Committed: Wed Jun 11 11:52:35 2014 -0400
--
bin/config.sh | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1b170e8e/bin/config.sh
--
diff --git a/bin/config.sh b/bin/config.sh
index 931ec8b..7663473 100755
--- a/bin/config.sh
+++ b/bin/config.sh
@@ -115,7 +115,11 @@ then
fi
export HADOOP_PREFIX
-MASTER1=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters" | head -1)
+unset MASTER1
+if [[ -f "$ACCUMULO_CONF_DIR/masters" ]]; then
+ MASTER1=$(egrep -v '(^#|^\s*$)' "$ACCUMULO_CONF_DIR/masters" | head -1)
+fi
+
if [ -z "${MONITOR}" ] ; then
MONITOR=$MASTER1
if [ -f "$ACCUMULO_CONF_DIR/monitor" ]; then
[2/3] git commit: ACCUMULO-2787 Tune max open file recommendation
ACCUMULO-2787 Tune max open file recommendation
Make the max files recommendation configurable to account for various
cluster sizes. Reduce the default from 64k to 32k because we shouldn't
need to compensate for running datanodes as the same user.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0356387b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0356387b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0356387b
Branch: refs/heads/master
Commit: 0356387baba93b5b372b2733ce24ca52938260e4
Parents: 1a33f6d
Author: Mike Drob
Authored: Mon Jun 9 18:34:31 2014 -0400
Committer: Mike Drob
Committed: Tue Jun 10 11:30:55 2014 -0400
--
bin/start-server.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0356387b/bin/start-server.sh
--
diff --git a/bin/start-server.sh b/bin/start-server.sh
index 08c5126..62ad91d 100755
--- a/bin/start-server.sh
+++ b/bin/start-server.sh
@@ -76,8 +76,10 @@ if [ -z "$PID" ]; then
fi
if [ -n "$MAX_FILES_OPEN" ] && [ -n "$SLAVES" ] ; then
- if [ "$SLAVES" -gt 10 ] && [ "$MAX_FILES_OPEN" -lt 65536 ]; then
- echo "WARN : Max files open on $HOST is $MAX_FILES_OPEN, recommend
65536"
+ MAX_FILES_RECOMMENDED=${MAX_FILES_RECOMMENDED:-32768}
+ if (( SLAVES > 10 )) && (( MAX_FILES_OPEN < MAX_FILES_RECOMMENDED ))
+ then
+ echo "WARN : Max open files on $HOST is $MAX_FILES_OPEN, recommend
$MAX_FILES_RECOMMENDED" >&2
fi
fi
else
[1/3] git commit: ACCUMULO-2787 Tune max open file recommendation
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT 1a33f6df9 -> 0356387ba
refs/heads/master 7eabcb6d7 -> 8ce0b687f
ACCUMULO-2787 Tune max open file recommendation
Make the max files recommendation configurable to account for various
cluster sizes. Reduce the default from 64k to 32k because we shouldn't
need to compensate for running datanodes as the same user.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0356387b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0356387b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0356387b
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 0356387baba93b5b372b2733ce24ca52938260e4
Parents: 1a33f6d
Author: Mike Drob
Authored: Mon Jun 9 18:34:31 2014 -0400
Committer: Mike Drob
Committed: Tue Jun 10 11:30:55 2014 -0400
--
bin/start-server.sh | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0356387b/bin/start-server.sh
--
diff --git a/bin/start-server.sh b/bin/start-server.sh
index 08c5126..62ad91d 100755
--- a/bin/start-server.sh
+++ b/bin/start-server.sh
@@ -76,8 +76,10 @@ if [ -z "$PID" ]; then
fi
if [ -n "$MAX_FILES_OPEN" ] && [ -n "$SLAVES" ] ; then
- if [ "$SLAVES" -gt 10 ] && [ "$MAX_FILES_OPEN" -lt 65536 ]; then
- echo "WARN : Max files open on $HOST is $MAX_FILES_OPEN, recommend
65536"
+ MAX_FILES_RECOMMENDED=${MAX_FILES_RECOMMENDED:-32768}
+ if (( SLAVES > 10 )) && (( MAX_FILES_OPEN < MAX_FILES_RECOMMENDED ))
+ then
+ echo "WARN : Max open files on $HOST is $MAX_FILES_OPEN, recommend
$MAX_FILES_RECOMMENDED" >&2
fi
fi
else
[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8ce0b687 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8ce0b687 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8ce0b687 Branch: refs/heads/master Commit: 8ce0b687fdc9da5986558d1aad0353cb0bcd67a2 Parents: 7eabcb6 0356387 Author: Mike Drob Authored: Tue Jun 10 13:27:27 2014 -0400 Committer: Mike Drob Committed: Tue Jun 10 13:27:27 2014 -0400 -- bin/start-server.sh | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) --
[2/6] git commit: ACCUMULO-2864 add nullcheck in ZooSession.shutdown
ACCUMULO-2864 add nullcheck in ZooSession.shutdown
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/affb9743
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/affb9743
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/affb9743
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: affb9743a3297ff6a147ab23bba44b5c5c045420
Parents: 9fcca2e
Author: Mike Drob
Authored: Thu Jun 5 15:11:12 2014 -0700
Committer: Mike Drob
Committed: Thu Jun 5 15:11:12 2014 -0700
--
.../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/affb9743/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
diff --git
a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
index de9729a..205ff01 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
@@ -152,6 +152,9 @@ public class ZooSession {
}
public static synchronized void shutdown() {
+if (sessions == null)
+ return;
+
for (ZooSessionInfo zsi : sessions.values()) {
try {
zsi.zooKeeper.close();
[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18d6ca1b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18d6ca1b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18d6ca1b Branch: refs/heads/master Commit: 18d6ca1bf79793443366c04e54285214a69eb422 Parents: c202598 affb974 Author: Mike Drob Authored: Thu Jun 5 15:12:08 2014 -0700 Committer: Mike Drob Committed: Thu Jun 5 15:12:08 2014 -0700 -- .../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/18d6ca1b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java --
[6/6] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/809b73c0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/809b73c0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/809b73c0 Branch: refs/heads/master Commit: 809b73c052b5c50090c502a03ccd9a7da4c767dd Parents: e106fe0 18d6ca1 Author: Mike Drob Authored: Thu Jun 5 15:12:21 2014 -0700 Committer: Mike Drob Committed: Thu Jun 5 15:12:21 2014 -0700 -- .../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++ 1 file changed, 3 insertions(+) --
[1/6] git commit: ACCUMULO-2864 add nullcheck in ZooSession.shutdown
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT 9fcca2ede -> affb9743a
refs/heads/1.6.1-SNAPSHOT c2025989f -> 18d6ca1bf
refs/heads/master e106fe07b -> 809b73c05
ACCUMULO-2864 add nullcheck in ZooSession.shutdown
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/affb9743
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/affb9743
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/affb9743
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: affb9743a3297ff6a147ab23bba44b5c5c045420
Parents: 9fcca2e
Author: Mike Drob
Authored: Thu Jun 5 15:11:12 2014 -0700
Committer: Mike Drob
Committed: Thu Jun 5 15:11:12 2014 -0700
--
.../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/affb9743/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
diff --git
a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
index de9729a..205ff01 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
@@ -152,6 +152,9 @@ public class ZooSession {
}
public static synchronized void shutdown() {
+if (sessions == null)
+ return;
+
for (ZooSessionInfo zsi : sessions.values()) {
try {
zsi.zooKeeper.close();
[3/6] git commit: ACCUMULO-2864 add nullcheck in ZooSession.shutdown
ACCUMULO-2864 add nullcheck in ZooSession.shutdown
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/affb9743
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/affb9743
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/affb9743
Branch: refs/heads/master
Commit: affb9743a3297ff6a147ab23bba44b5c5c045420
Parents: 9fcca2e
Author: Mike Drob
Authored: Thu Jun 5 15:11:12 2014 -0700
Committer: Mike Drob
Committed: Thu Jun 5 15:11:12 2014 -0700
--
.../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++
1 file changed, 3 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/affb9743/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
--
diff --git
a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
index de9729a..205ff01 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
@@ -152,6 +152,9 @@ public class ZooSession {
}
public static synchronized void shutdown() {
+if (sessions == null)
+ return;
+
for (ZooSessionInfo zsi : sessions.values()) {
try {
zsi.zooKeeper.close();
[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18d6ca1b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18d6ca1b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18d6ca1b Branch: refs/heads/1.6.1-SNAPSHOT Commit: 18d6ca1bf79793443366c04e54285214a69eb422 Parents: c202598 affb974 Author: Mike Drob Authored: Thu Jun 5 15:12:08 2014 -0700 Committer: Mike Drob Committed: Thu Jun 5 15:12:08 2014 -0700 -- .../main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java | 3 +++ 1 file changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/18d6ca1b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java --
[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a53d4ec0 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a53d4ec0 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a53d4ec0 Branch: refs/heads/master Commit: a53d4ec05542a3d045e1dff52280986a7cfdc119 Parents: 29e6dee 5d2cf87 Author: Mike Drob Authored: Thu May 15 14:33:24 2014 -0400 Committer: Mike Drob Committed: Thu May 15 14:33:24 2014 -0400 -- .../java/org/apache/accumulo/tserver/log/LocalWALRecovery.java | 3 +-- .../org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java| 4 +++- 2 files changed, 4 insertions(+), 3 deletions(-) --
[1/3] git commit: ACCUMULO-2814 Specify absolute directory in test
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT bd3c2f086 -> 5d2cf8704
refs/heads/master 29e6dee85 -> a53d4ec05
ACCUMULO-2814 Specify absolute directory in test
In a real accumulo deployment we re-resolve relative paths based on
ACCUMULO_HOME, which is good, but in test scenario having it set just
messed things up.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d2cf870
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d2cf870
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d2cf870
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 5d2cf870440f4a084c560010b09bdfa911bbb618
Parents: bd3c2f0
Author: Mike Drob
Authored: Thu May 15 14:31:22 2014 -0400
Committer: Mike Drob
Committed: Thu May 15 14:31:22 2014 -0400
--
.../java/org/apache/accumulo/tserver/log/LocalWALRecovery.java | 3 +--
.../org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java| 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d2cf870/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
--
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
index 31f4f14..51c13d5 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
@@ -32,7 +32,6 @@ import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.accumulo.server.logger.LogFileKey;
import org.apache.accumulo.server.logger.LogFileValue;
-import org.apache.accumulo.tserver.TabletServer;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -49,7 +48,7 @@ import com.google.common.annotations.VisibleForTesting;
* This class will attempt to rewrite any local WALs to HDFS.
*/
public class LocalWALRecovery implements Runnable {
- private static final Logger log = Logger.getLogger(TabletServer.class);
+ private static final Logger log = Logger.getLogger(LocalWALRecovery.class);
public static void main(String[] args) throws IOException {
AccumuloConfiguration configuration =
SiteConfiguration.getInstance(SiteConfiguration.getDefaultConfiguration());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d2cf870/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
--
diff --git
a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
index 54752e9..99190b2 100644
---
a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
+++
b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
@@ -55,8 +55,10 @@ public class LocalWALRecoveryTest {
@Before
public void setUp() throws Exception {
+File source = new File("src/test/resources", "walog-from-14");
+
configuration = createMock(AccumuloConfiguration.class);
-
expect(configuration.get(Property.LOGGER_DIR)).andReturn("src/test/resources/walog-from-14").anyTimes();
+
expect(configuration.get(Property.LOGGER_DIR)).andReturn(source.getAbsolutePath()).anyTimes();
replay(configuration);
walTarget = folder.newFolder("wal");
[2/3] git commit: ACCUMULO-2814 Specify absolute directory in test
ACCUMULO-2814 Specify absolute directory in test
In a real accumulo deployment we re-resolve relative paths based on
ACCUMULO_HOME, which is good, but in test scenario having it set just
messed things up.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/5d2cf870
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/5d2cf870
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/5d2cf870
Branch: refs/heads/master
Commit: 5d2cf870440f4a084c560010b09bdfa911bbb618
Parents: bd3c2f0
Author: Mike Drob
Authored: Thu May 15 14:31:22 2014 -0400
Committer: Mike Drob
Committed: Thu May 15 14:31:22 2014 -0400
--
.../java/org/apache/accumulo/tserver/log/LocalWALRecovery.java | 3 +--
.../org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java| 4 +++-
2 files changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d2cf870/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
--
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
index 31f4f14..51c13d5 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
@@ -32,7 +32,6 @@ import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.fs.VolumeManagerImpl;
import org.apache.accumulo.server.logger.LogFileKey;
import org.apache.accumulo.server.logger.LogFileValue;
-import org.apache.accumulo.tserver.TabletServer;
import org.apache.hadoop.fs.FSDataOutputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
@@ -49,7 +48,7 @@ import com.google.common.annotations.VisibleForTesting;
* This class will attempt to rewrite any local WALs to HDFS.
*/
public class LocalWALRecovery implements Runnable {
- private static final Logger log = Logger.getLogger(TabletServer.class);
+ private static final Logger log = Logger.getLogger(LocalWALRecovery.class);
public static void main(String[] args) throws IOException {
AccumuloConfiguration configuration =
SiteConfiguration.getInstance(SiteConfiguration.getDefaultConfiguration());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/5d2cf870/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
--
diff --git
a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
index 54752e9..99190b2 100644
---
a/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
+++
b/server/tserver/src/test/java/org/apache/accumulo/tserver/log/LocalWALRecoveryTest.java
@@ -55,8 +55,10 @@ public class LocalWALRecoveryTest {
@Before
public void setUp() throws Exception {
+File source = new File("src/test/resources", "walog-from-14");
+
configuration = createMock(AccumuloConfiguration.class);
-
expect(configuration.get(Property.LOGGER_DIR)).andReturn("src/test/resources/walog-from-14").anyTimes();
+
expect(configuration.get(Property.LOGGER_DIR)).andReturn(source.getAbsolutePath()).anyTimes();
replay(configuration);
walTarget = folder.newFolder("wal");
[4/6] git commit: ACCUMULO-2770 Add utility to read local WAL
ACCUMULO-2770 Add utility to read local WAL
Forward port the upgrade code from 1.5.x into a separate utility so
that a user can still read local WALs if they happen to be around.
Recreate LogFile{Key,Value} in their old packages so that we can still
read the old sequence files that have embedded class names.
Modify the utility to optionally accept values as command line options
instead of searching around in the configuration settings. Testability!
Add a WAL file explicitly generated under 1.4 for testing purposes.
Add documentation to the troubleshooting guide to describe usage.
Recover your logs
After something has gone wrong
Watch your flowers bloom
commit 2db5ce6186e32c451328154b024951cc5090505f
Author: Eric C. Newton
Date: Tue Jun 5 13:18:22 2012 +
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/366aef1b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/366aef1b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/366aef1b
Branch: refs/heads/master
Commit: 366aef1b9f970a3a3e6d5034c336fd17695920fa
Parents: b33cb73
Author: Mike Drob
Authored: Wed May 14 00:11:21 2014 -0400
Committer: Mike Drob
Committed: Wed May 14 10:36:18 2014 -0400
--
.../org/apache/accumulo/core/conf/Property.java | 8 +-
.../chapters/troubleshooting.tex| 13 ++
server/tserver/pom.xml | 5 +
.../accumulo/server/logger/LogFileKey.java | 25 +++
.../accumulo/server/logger/LogFileValue.java| 25 +++
.../accumulo/tserver/log/LocalWALRecovery.java | 176 +++
.../tserver/log/LocalWALRecoveryTest.java | 108
.../550e8400-e29b-41d4-a716-44665544| Bin 0 -> 91784 bytes
8 files changed, 356 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/366aef1b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--
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 60969be..47d1817 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
@@ -268,10 +268,10 @@ public enum Property {
// properties that are specific to logger server behavior
LOGGER_PREFIX("logger.", null, PropertyType.PREFIX, "Properties in this
category affect the behavior of the write-ahead logger servers"),
- LOGGER_DIR("logger.dir.walog", "walogs", PropertyType.PATH,
- "The property only needs to be set if upgrading from 1.4 which used to
store write-ahead logs on the local filesystem. In 1.5 write-ahead logs are "
- + "stored in DFS. When 1.5 is started for the first time it will
copy any 1.4 write ahead logs into DFS. It is possible to specify a "
- + "comma-separated list of directories."),
+ LOGGER_DIR("logger.dir.walog", "walogs", PropertyType.PATH, "This property
is only needed if Accumulo was upgraded from a 1.4 or earlier version. "
+ + "In the upgrade to 1.5 this property is used to copy any earlier write
ahead logs into DFS. "
+ + "In 1.6+, this property is used by the LocalWALRecovery utility in the
event that something went wrong with that earlier upgrade. "
+ + "It is possible to specify a comma-separated list of directories."),
// accumulo garbage collector properties
GC_PREFIX("gc.", null, PropertyType.PREFIX, "Properties in this category
affect the behavior of the accumulo garbage collector."),
http://git-wip-us.apache.org/repos/asf/accumulo/blob/366aef1b/docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex
--
diff --git
a/docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex
b/docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex
index 203fe0c..57fdf13 100644
--- a/docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex
+++ b/docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex
@@ -764,6 +764,19 @@ A. The ``importdirectory`` shell command can be used to
import RFiles from the o
but extreme care should go into the decision to do this as it may result in
reintroduction of stale data or the
omission of new data.
+\subsection{Upgrade Issues}
+Q. I upgraded from 1.4 to 1.5 to 1.6 but still have some WAL files on local
disk. Do I have any way to recover them?
+
+A. Yes, you can recover them by running the LocalWALRecovery utility on each
node that needs recovery performed. The utility
+will default to using the directory specified by
\begin{verbatim}logger.dir.walog\end{verbatim} in your configuration, or can be
+o
[6/6] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT' Conflicts: docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/2556be27 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/2556be27 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/2556be27 Branch: refs/heads/master Commit: 2556be27324d722483a0bf586711d6e6c86f47ad Parents: 51742c6 366aef1 Author: Mike Drob Authored: Wed May 14 10:47:10 2014 -0400 Committer: Mike Drob Committed: Wed May 14 10:47:10 2014 -0400 -- bin/generate_monitor_certificate.sh | 4 +- .../org/apache/accumulo/core/conf/Property.java | 8 +- .../main/asciidoc/chapters/troubleshooting.txt | 10 ++ .../accumulo/server/logger/LogFileKey.java | 25 +++ .../accumulo/server/logger/LogFileValue.java| 25 +++ .../accumulo/tserver/log/LocalWALRecovery.java | 176 +++ .../tserver/log/LocalWALRecoveryTest.java | 108 .../550e8400-e29b-41d4-a716-44665544| Bin 0 -> 91784 bytes test/system/continuous/datanode-agitator.pl | 14 +- 9 files changed, 359 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2556be27/core/src/main/java/org/apache/accumulo/core/conf/Property.java -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/2556be27/docs/src/main/asciidoc/chapters/troubleshooting.txt -- diff --cc docs/src/main/asciidoc/chapters/troubleshooting.txt index eec75fa,000..00c1106 mode 100644,00..100644 --- a/docs/src/main/asciidoc/chapters/troubleshooting.txt +++ b/docs/src/main/asciidoc/chapters/troubleshooting.txt @@@ -1,758 -1,0 +1,768 @@@ +// 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. + +## Troubleshooting + +### Logs + +*Q*: The tablet server does not seem to be running!? What happened? + +Accumulo is a distributed system. It is supposed to run on remote +equipment, across hundreds of computers. Each program that runs on +these remote computers writes down events as they occur, into a local +file. By default, this is defined in ++$ACCUMULO_HOME/conf/accumule-env.sh+ as +ACCUMULO_LOG_DIR+. + +*A*: Look in the +$ACCUMULO_LOG_DIR/tserver*.log+ file. Specifically, check the end of the file. + +*Q*: The tablet server did not start and the debug log does not exists! What happened? + +When the individual programs are started, the stdout and stderr output +of these programs are stored in +.out+ and +.err+ files in ++$ACCUMULO_LOG_DIR+. Often, when there are missing configuration +options, files or permissions, messages will be left in these files. + +*A*: Probably a start-up problem. Look in +$ACCUMULO_LOG_DIR/tserver*.err+ + +### Monitor + +*Q*: Accumulo is not working, what's wrong? + +There's a small web server that collects information about all the +components that make up a running Accumulo instance. It will highlight +unusual or unexpected conditions. + +*A*: Point your browser to the monitor (typically the master host, on port 50095). Is anything red or yellow? + +*Q*: My browser is reporting connection refused, and I cannot get to the monitor + +The monitor program's output is also written to .err and .out files in +the +$ACCUMULO_LOG_DIR+. Look for problems in this file if the ++$ACCUMULO_LOG_DIR/monitor*.log+ file does not exist. + +*A*: The monitor program is probably not running. Check the log files for errors. + +*Q*: My browser hangs trying to talk to the monitor. + +Your browser needs to be able to reach the monitor program. Often +large clusters are firewalled, or use a VPN for internal +communications. You can use SSH to proxy your browser to the cluster, +or consult with your system administrator to gain access to the server +from your browser. + +It is sometimes helpful to use a text-only browser to sanity-check the
[2/3] git commit: ACCUMULO-2807 Use deprecated SequenceFile.Reader
ACCUMULO-2807 Use deprecated SequenceFile.Reader
Use the old method
Of creating a reader
To retain compat
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c57bc8d5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c57bc8d5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c57bc8d5
Branch: refs/heads/master
Commit: c57bc8d5d509e368bc0d4a4b8e2f80503efade26
Parents: 366aef1
Author: Mike Drob
Authored: Wed May 14 15:29:23 2014 -0400
Committer: Mike Drob
Committed: Wed May 14 15:29:23 2014 -0400
--
.../org/apache/accumulo/tserver/log/LocalWALRecovery.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c57bc8d5/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
--
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
index 2adb52d..31f4f14 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
@@ -145,7 +145,12 @@ public class LocalWALRecovery implements Runnable {
log.info("Openning local log " + file.getAbsolutePath());
-Reader reader = new SequenceFile.Reader(fs.getConf(),
SequenceFile.Reader.file(new Path(file.toURI(;
+Path localWal = new Path(file.toURI());
+FileSystem localFs = FileSystem.getLocal(fs.getConf());
+
+@SuppressWarnings("deprecation")
+Reader reader = new SequenceFile.Reader(localFs, localWal,
localFs.getConf());
+// Reader reader = new SequenceFile.Reader(localFs.getConf(),
SequenceFile.Reader.file(localWal));
Path tmp = new Path(options.destination + "/" + name + ".copy");
FSDataOutputStream writer = fs.create(tmp);
while (reader.next(key, value)) {
[1/3] git commit: ACCUMULO-2807 Use deprecated SequenceFile.Reader
Repository: accumulo
Updated Branches:
refs/heads/1.6.1-SNAPSHOT 366aef1b9 -> c57bc8d5d
refs/heads/master 2556be273 -> a119746bf
ACCUMULO-2807 Use deprecated SequenceFile.Reader
Use the old method
Of creating a reader
To retain compat
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c57bc8d5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c57bc8d5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c57bc8d5
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: c57bc8d5d509e368bc0d4a4b8e2f80503efade26
Parents: 366aef1
Author: Mike Drob
Authored: Wed May 14 15:29:23 2014 -0400
Committer: Mike Drob
Committed: Wed May 14 15:29:23 2014 -0400
--
.../org/apache/accumulo/tserver/log/LocalWALRecovery.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c57bc8d5/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
--
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
index 2adb52d..31f4f14 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/LocalWALRecovery.java
@@ -145,7 +145,12 @@ public class LocalWALRecovery implements Runnable {
log.info("Openning local log " + file.getAbsolutePath());
-Reader reader = new SequenceFile.Reader(fs.getConf(),
SequenceFile.Reader.file(new Path(file.toURI(;
+Path localWal = new Path(file.toURI());
+FileSystem localFs = FileSystem.getLocal(fs.getConf());
+
+@SuppressWarnings("deprecation")
+Reader reader = new SequenceFile.Reader(localFs, localWal,
localFs.getConf());
+// Reader reader = new SequenceFile.Reader(localFs.getConf(),
SequenceFile.Reader.file(localWal));
Path tmp = new Path(options.destination + "/" + name + ".copy");
FSDataOutputStream writer = fs.create(tmp);
while (reader.next(key, value)) {
[3/3] git commit: Merge branch '1.6.1-SNAPSHOT'
Merge branch '1.6.1-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/a119746b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a119746b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a119746b Branch: refs/heads/master Commit: a119746bf8f983c8143c2c3f36116831d83a9546 Parents: 2556be2 c57bc8d Author: Mike Drob Authored: Wed May 14 15:30:21 2014 -0400 Committer: Mike Drob Committed: Wed May 14 15:30:21 2014 -0400 -- .../org/apache/accumulo/tserver/log/LocalWALRecovery.java | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) --
[3/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b33cb733 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b33cb733 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b33cb733 Branch: refs/heads/master Commit: b33cb733b004786f5699194ba990c6ad420e4263 Parents: cc617cd 72fd01f Author: Drew Farris Authored: Tue May 13 23:03:10 2014 -0400 Committer: Drew Farris Committed: Tue May 13 23:03:10 2014 -0400 -- bin/generate_monitor_certificate.sh | 4 ++-- test/system/continuous/datanode-agitator.pl | 14 +- 2 files changed, 11 insertions(+), 7 deletions(-) --
[2/6] git commit: ACCUMULO-2768 Agitator not restarting all datanodes
ACCUMULO-2768 Agitator not restarting all datanodes
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/72fd01ff
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/72fd01ff
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/72fd01ff
Branch: refs/heads/master
Commit: 72fd01ff2cbe85b1e9d2908331308a41857591ed
Parents: 312856a
Author: Drew Farris
Authored: Tue May 13 22:53:48 2014 -0400
Committer: Drew Farris
Committed: Tue May 13 22:53:48 2014 -0400
--
test/system/continuous/datanode-agitator.pl | 14 +-
1 file changed, 9 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/72fd01ff/test/system/continuous/datanode-agitator.pl
--
diff --git a/test/system/continuous/datanode-agitator.pl
b/test/system/continuous/datanode-agitator.pl
index acb5843..1f469b2 100755
--- a/test/system/continuous/datanode-agitator.pl
+++ b/test/system/continuous/datanode-agitator.pl
@@ -105,7 +105,7 @@ if ($minKill > $maxKill){
while(1){
$numToKill = int(rand($maxKill - $minKill + 1)) + $minKill;
- %killed = {};
+ %killed = ();
$server = "";
for($i = 0; $i < $numToKill; $i++){
@@ -124,11 +124,15 @@ while(1){
$nextsleep2 = int(rand($sleep2max - $sleep2)) + $sleep2;
sleep($nextsleep2 * 60);
- $t = strftime "%Y%m%d %H:%M:%S", localtime;
- print STDERR "$t Starting datanode on $server\n";
- # We can just start as we're the HDFS user
- system("ssh $server '$HADOOP_PREFIX/sbin/hadoop-daemon.sh start datanode'");
+ foreach $restart (keys %killed) {
+
+$t = strftime "%Y%m%d %H:%M:%S", localtime;
+
+print STDERR "$t Starting datanode on $restart\n";
+# We can just start as we're the HDFS user
+system("ssh $restart '$HADOOP_PREFIX/sbin/hadoop-daemon.sh start
datanode'");
+ }
$nextsleep1 = int(rand($sleep1max - $sleep1)) + $sleep1;
sleep($nextsleep1 * 60);
[5/6] git commit: ACCUMULO-2770 Add utility to read local WAL
ACCUMULO-2770 Add utility to read local WAL
Forward port the upgrade code from 1.5.x into a separate utility so
that a user can still read local WALs if they happen to be around.
Recreate LogFile{Key,Value} in their old packages so that we can still
read the old sequence files that have embedded class names.
Modify the utility to optionally accept values as command line options
instead of searching around in the configuration settings. Testability!
Add a WAL file explicitly generated under 1.4 for testing purposes.
Add documentation to the troubleshooting guide to describe usage.
Recover your logs
After something has gone wrong
Watch your flowers bloom
commit 2db5ce6186e32c451328154b024951cc5090505f
Author: Eric C. Newton
Date: Tue Jun 5 13:18:22 2012 +
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/366aef1b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/366aef1b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/366aef1b
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 366aef1b9f970a3a3e6d5034c336fd17695920fa
Parents: b33cb73
Author: Mike Drob
Authored: Wed May 14 00:11:21 2014 -0400
Committer: Mike Drob
Committed: Wed May 14 10:36:18 2014 -0400
--
.../org/apache/accumulo/core/conf/Property.java | 8 +-
.../chapters/troubleshooting.tex| 13 ++
server/tserver/pom.xml | 5 +
.../accumulo/server/logger/LogFileKey.java | 25 +++
.../accumulo/server/logger/LogFileValue.java| 25 +++
.../accumulo/tserver/log/LocalWALRecovery.java | 176 +++
.../tserver/log/LocalWALRecoveryTest.java | 108
.../550e8400-e29b-41d4-a716-44665544| Bin 0 -> 91784 bytes
8 files changed, 356 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/366aef1b/core/src/main/java/org/apache/accumulo/core/conf/Property.java
--
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 60969be..47d1817 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
@@ -268,10 +268,10 @@ public enum Property {
// properties that are specific to logger server behavior
LOGGER_PREFIX("logger.", null, PropertyType.PREFIX, "Properties in this
category affect the behavior of the write-ahead logger servers"),
- LOGGER_DIR("logger.dir.walog", "walogs", PropertyType.PATH,
- "The property only needs to be set if upgrading from 1.4 which used to
store write-ahead logs on the local filesystem. In 1.5 write-ahead logs are "
- + "stored in DFS. When 1.5 is started for the first time it will
copy any 1.4 write ahead logs into DFS. It is possible to specify a "
- + "comma-separated list of directories."),
+ LOGGER_DIR("logger.dir.walog", "walogs", PropertyType.PATH, "This property
is only needed if Accumulo was upgraded from a 1.4 or earlier version. "
+ + "In the upgrade to 1.5 this property is used to copy any earlier write
ahead logs into DFS. "
+ + "In 1.6+, this property is used by the LocalWALRecovery utility in the
event that something went wrong with that earlier upgrade. "
+ + "It is possible to specify a comma-separated list of directories."),
// accumulo garbage collector properties
GC_PREFIX("gc.", null, PropertyType.PREFIX, "Properties in this category
affect the behavior of the accumulo garbage collector."),
http://git-wip-us.apache.org/repos/asf/accumulo/blob/366aef1b/docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex
--
diff --git
a/docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex
b/docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex
index 203fe0c..57fdf13 100644
--- a/docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex
+++ b/docs/src/main/latex/accumulo_user_manual/chapters/troubleshooting.tex
@@ -764,6 +764,19 @@ A. The ``importdirectory`` shell command can be used to
import RFiles from the o
but extreme care should go into the decision to do this as it may result in
reintroduction of stale data or the
omission of new data.
+\subsection{Upgrade Issues}
+Q. I upgraded from 1.4 to 1.5 to 1.6 but still have some WAL files on local
disk. Do I have any way to recover them?
+
+A. Yes, you can recover them by running the LocalWALRecovery utility on each
node that needs recovery performed. The utility
+will default to using the directory specified by
\begin{verbatim}logger.dir.walog\end{verbatim} in your configuration, or c
[1/6] git commit: ACCUMULO-2790 generate_monitor_certificate.sh fails on OSX
Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT b33cb733b -> 366aef1b9 refs/heads/master 51742c658 -> 2556be273 ACCUMULO-2790 generate_monitor_certificate.sh fails on OSX Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/312856ae Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/312856ae Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/312856ae Branch: refs/heads/master Commit: 312856ae6a2a2324f841796a7ddeacbe9c7bca92 Parents: 7e9cb85 Author: Drew Farris Authored: Tue May 13 22:51:35 2014 -0400 Committer: Drew Farris Committed: Tue May 13 22:51:35 2014 -0400 -- bin/generate_monitor_certificate.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/312856ae/bin/generate_monitor_certificate.sh -- diff --git a/bin/generate_monitor_certificate.sh b/bin/generate_monitor_certificate.sh index d00c811..fe98bb3 100755 --- a/bin/generate_monitor_certificate.sh +++ b/bin/generate_monitor_certificate.sh @@ -28,8 +28,8 @@ bin="$( cd -P "$( dirname "$SOURCE" )" && pwd )" . "$bin"/config.sh ALIAS="default" -KEYPASS=$(tr -dc '#-~' < /dev/urandom | tr -d '<>&' | head -c 20) -STOREPASS=$(tr -dc '#-~' < /dev/urandom | tr -d '<>&' | head -c 20) +KEYPASS=$(LC_CTYPE=C tr -dc '#-~' < /dev/urandom | tr -d '<>&' | head -c 20) +STOREPASS=$(LC_CTYPE=C tr -dc '#-~' < /dev/urandom | tr -d '<>&' | head -c 20) KEYSTOREPATH="$ACCUMULO_HOME/conf/keystore.jks" TRUSTSTOREPATH="$ACCUMULO_HOME/conf/cacerts.jks" CERTPATH="$ACCUMULO_HOME/conf/server.cer"
svn commit: r908186 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/ 1.6/apidocs/
Author: mdrob Date: Tue May 6 14:30:16 2014 New Revision: 908186 Log: Publishing svnmucc operation to accumulo site by mdrob Added: websites/production/accumulo/content/ - copied from r908185, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r908185, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r908185, websites/production/accumulo/content/1.5/apidocs/ websites/production/accumulo/content/1.6/apidocs/ - copied from r908185, websites/production/accumulo/content/1.6/apidocs/
svn commit: r1592759 - /accumulo/site/trunk/content/release_notes/1.6.0.mdtext
Author: mdrob Date: Tue May 6 14:29:51 2014 New Revision: 1592759 URL: http://svn.apache.org/r1592759 Log: Accidental row duplication. Modified: accumulo/site/trunk/content/release_notes/1.6.0.mdtext Modified: accumulo/site/trunk/content/release_notes/1.6.0.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.6.0.mdtext?rev=1592759&r1=1592758&r2=1592759&view=diff == --- accumulo/site/trunk/content/release_notes/1.6.0.mdtext (original) +++ accumulo/site/trunk/content/release_notes/1.6.0.mdtext Tue May 6 14:29:51 2014 @@ -348,16 +348,6 @@ The following acronyms are used in the t 1.6.0 RC3 24-hour CI with agitation. Verified. - -CentOS 6.4 -Sun JDK 1.6.0_31 -CDH 4.5.0 -7 -3.4.5 (under CDH 4.5.0) -Yes -3a1b38 -72-hour CI with agitation. Verified. - [ACCUMULO-1]: https://issues.apache.org/jira/browse/ACCUMULO-1
svn commit: r1592758 - /accumulo/site/trunk/content/release_notes/1.6.0.mdtext
Author: mdrob Date: Tue May 6 14:28:59 2014 New Revision: 1592758 URL: http://svn.apache.org/r1592758 Log: Add tests to release notes. Modified: accumulo/site/trunk/content/release_notes/1.6.0.mdtext Modified: accumulo/site/trunk/content/release_notes/1.6.0.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.6.0.mdtext?rev=1592758&r1=1592757&r2=1592758&view=diff == --- accumulo/site/trunk/content/release_notes/1.6.0.mdtext (original) +++ accumulo/site/trunk/content/release_notes/1.6.0.mdtext Tue May 6 14:28:59 2014 @@ -318,6 +318,46 @@ The following acronyms are used in the t 1.6.0 RC4 and RC5 24-hour RW (LongClean) with and without agitation + +CentOS 6.4 +Sun JDK 1.6.0_31 +CDH 4.5.0 +7 +3.4.5 (under CDH 4.5.0) +Yes +3a1b38 +72-hour CI with and without agitation. Verified. + + +CentOS 6.4 +Sun JDK 1.6.0_31 +CDH 4.5.0 +7 +3.4.5 (under CDH 4.5.0) +Yes +1.6.0 RC2 +24-hour CI without agitation. Verified. + + +CentOS 6.4 +Sun JDK 1.6.0_31 +CDH 4.5.0 +7 +3.4.5 (under CDH 4.5.0) +Yes +1.6.0 RC3 +24-hour CI with agitation. Verified. + + +CentOS 6.4 +Sun JDK 1.6.0_31 +CDH 4.5.0 +7 +3.4.5 (under CDH 4.5.0) +Yes +3a1b38 +72-hour CI with agitation. Verified. + [ACCUMULO-1]: https://issues.apache.org/jira/browse/ACCUMULO-1
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1dae0298 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1dae0298 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1dae0298 Branch: refs/heads/master Commit: 1dae0298fd2c1bee80855e5c4067ef569c6299b5 Parents: 7a82625 1c38957 Author: Mike Drob Authored: Wed Apr 30 15:33:41 2014 -0400 Committer: Mike Drob Committed: Wed Apr 30 15:33:41 2014 -0400 -- .../accumulo/test/randomwalk/FrameworkTest.java | 48 ++-- 1 file changed, 24 insertions(+), 24 deletions(-) --
[2/3] git commit: ACCUMULO-2765 Convert FrameworkTest to junit4
ACCUMULO-2765 Convert FrameworkTest to junit4
Use JUnit 4
To enable new features
Don't catch exceptions
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1c38957c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1c38957c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1c38957c
Branch: refs/heads/master
Commit: 1c38957c453df84462a2cd837b155d590d012d05
Parents: b3c8936
Author: Mike Drob
Authored: Wed Apr 30 15:29:18 2014 -0400
Committer: Mike Drob
Committed: Wed Apr 30 15:29:18 2014 -0400
--
.../accumulo/test/randomwalk/FrameworkTest.java | 48 ++--
1 file changed, 24 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1c38957c/test/src/test/java/org/apache/accumulo/test/randomwalk/FrameworkTest.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/randomwalk/FrameworkTest.java
b/test/src/test/java/org/apache/accumulo/test/randomwalk/FrameworkTest.java
index d43347e..ca003ab 100644
--- a/test/src/test/java/org/apache/accumulo/test/randomwalk/FrameworkTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/randomwalk/FrameworkTest.java
@@ -16,52 +16,52 @@
*/
package org.apache.accumulo.test.randomwalk;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
-import junit.framework.TestCase;
-
import org.apache.accumulo.test.randomwalk.unit.CreateTable;
-import org.junit.Assert;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
-public class FrameworkTest extends TestCase {
+public class FrameworkTest {
- public void testXML() {
+ // Need to use fully qualified name here because of conflict with
org.apache.accumulo.test.randomwalk.Test
+ @org.junit.Test
+ public void testXML() throws SAXException, URISyntaxException,
ParserConfigurationException, IOException {
+SchemaFactory sf =
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+Schema moduleSchema = sf.newSchema(getFile("/randomwalk/module.xsd"));
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-DocumentBuilder docbuilder;
+dbf.setSchema(moduleSchema);
-SchemaFactory sf =
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-Schema moduleSchema = null;
-try {
- moduleSchema = sf.newSchema(new
File(this.getClass().getResource("/randomwalk/module.xsd").toURI()));
-} catch (Exception e) {
- Assert.fail("Caught exception: " + e);
-}
+DocumentBuilder docbuilder = dbf.newDocumentBuilder();
+Document document = docbuilder.parse(getFile("/randomwalk/Basic.xml"));
-dbf.setSchema(moduleSchema);
+assertNotEquals("Parsing randomwalk xml should result in nodes.", 0,
document.getChildNodes().getLength());
+ }
-try {
- File f = new
File(this.getClass().getResource("/randomwalk/Basic.xml").toURI());
- docbuilder = dbf.newDocumentBuilder();
- docbuilder.parse(f);
-} catch (Exception e) {
- Assert.fail("Caught exception: " + e);
-}
+ private File getFile(String resource) throws URISyntaxException {
+return new File(this.getClass().getResource(resource).toURI());
}
+ @org.junit.Test
public void testRWTest() {
-
Test t1 = new CreateTable();
-
assertTrue(t1.toString().equals("org.apache.accumulo.test.randomwalk.unit.CreateTable"));
+assertEquals("org.apache.accumulo.test.randomwalk.unit.CreateTable",
t1.toString());
Test t2 = new CreateTable();
-assertTrue(t1.equals(t2));
+assertEquals("CreateTable test nodes were not equal.", t1, t2);
}
}
[1/3] git commit: ACCUMULO-2765 Convert FrameworkTest to junit4
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT b3c893671 -> 1c38957c4
refs/heads/master 7a826251d -> 1dae0298f
ACCUMULO-2765 Convert FrameworkTest to junit4
Use JUnit 4
To enable new features
Don't catch exceptions
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1c38957c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1c38957c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1c38957c
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1c38957c453df84462a2cd837b155d590d012d05
Parents: b3c8936
Author: Mike Drob
Authored: Wed Apr 30 15:29:18 2014 -0400
Committer: Mike Drob
Committed: Wed Apr 30 15:29:18 2014 -0400
--
.../accumulo/test/randomwalk/FrameworkTest.java | 48 ++--
1 file changed, 24 insertions(+), 24 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1c38957c/test/src/test/java/org/apache/accumulo/test/randomwalk/FrameworkTest.java
--
diff --git
a/test/src/test/java/org/apache/accumulo/test/randomwalk/FrameworkTest.java
b/test/src/test/java/org/apache/accumulo/test/randomwalk/FrameworkTest.java
index d43347e..ca003ab 100644
--- a/test/src/test/java/org/apache/accumulo/test/randomwalk/FrameworkTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/randomwalk/FrameworkTest.java
@@ -16,52 +16,52 @@
*/
package org.apache.accumulo.test.randomwalk;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+
import java.io.File;
+import java.io.IOException;
+import java.net.URISyntaxException;
import javax.xml.XMLConstants;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
import javax.xml.validation.Schema;
import javax.xml.validation.SchemaFactory;
-import junit.framework.TestCase;
-
import org.apache.accumulo.test.randomwalk.unit.CreateTable;
-import org.junit.Assert;
+import org.w3c.dom.Document;
+import org.xml.sax.SAXException;
-public class FrameworkTest extends TestCase {
+public class FrameworkTest {
- public void testXML() {
+ // Need to use fully qualified name here because of conflict with
org.apache.accumulo.test.randomwalk.Test
+ @org.junit.Test
+ public void testXML() throws SAXException, URISyntaxException,
ParserConfigurationException, IOException {
+SchemaFactory sf =
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+Schema moduleSchema = sf.newSchema(getFile("/randomwalk/module.xsd"));
DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
-DocumentBuilder docbuilder;
+dbf.setSchema(moduleSchema);
-SchemaFactory sf =
SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
-Schema moduleSchema = null;
-try {
- moduleSchema = sf.newSchema(new
File(this.getClass().getResource("/randomwalk/module.xsd").toURI()));
-} catch (Exception e) {
- Assert.fail("Caught exception: " + e);
-}
+DocumentBuilder docbuilder = dbf.newDocumentBuilder();
+Document document = docbuilder.parse(getFile("/randomwalk/Basic.xml"));
-dbf.setSchema(moduleSchema);
+assertNotEquals("Parsing randomwalk xml should result in nodes.", 0,
document.getChildNodes().getLength());
+ }
-try {
- File f = new
File(this.getClass().getResource("/randomwalk/Basic.xml").toURI());
- docbuilder = dbf.newDocumentBuilder();
- docbuilder.parse(f);
-} catch (Exception e) {
- Assert.fail("Caught exception: " + e);
-}
+ private File getFile(String resource) throws URISyntaxException {
+return new File(this.getClass().getResource(resource).toURI());
}
+ @org.junit.Test
public void testRWTest() {
-
Test t1 = new CreateTable();
-
assertTrue(t1.toString().equals("org.apache.accumulo.test.randomwalk.unit.CreateTable"));
+assertEquals("org.apache.accumulo.test.randomwalk.unit.CreateTable",
t1.toString());
Test t2 = new CreateTable();
-assertTrue(t1.equals(t2));
+assertEquals("CreateTable test nodes were not equal.", t1, t2);
}
}
svn commit: r907369 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/
Author: mdrob Date: Tue Apr 29 18:27:03 2014 New Revision: 907369 Log: Publishing svnmucc operation to accumulo site by mdrob Added: websites/production/accumulo/content/ - copied from r907368, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r907368, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r907368, websites/production/accumulo/content/1.5/apidocs/
svn commit: r1591047 - /accumulo/site/trunk/content/glossary.mdtext
Author: mdrob Date: Tue Apr 29 18:23:50 2014 New Revision: 1591047 URL: http://svn.apache.org/r1591047 Log: CMS commit to accumulo by mdrob Modified: accumulo/site/trunk/content/glossary.mdtext Modified: accumulo/site/trunk/content/glossary.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/glossary.mdtext?rev=1591047&r1=1591046&r2=1591047&view=diff == --- accumulo/site/trunk/content/glossary.mdtext (original) +++ accumulo/site/trunk/content/glossary.mdtext Tue Apr 29 18:23:50 2014 @@ -39,5 +39,5 @@ Notice:Licensed to the Apache Softwa - **scan** - reading a range of key/value pairs. - **tablet** - a contiguous key range; the unit of work for a tablet server. - **tablet servers** - a set of servers that hosts reads and writes for tablets. Each server hosts a distinct set of tablets at any given time, but the tablets may be hosted by different servers over time. -- **timestamp** - the portion of the key that controls versioning. Otherwise identical keys with differing timestamps are considered to be versions of a single *cell*. Accumulo can be configured to keep the *N* newest versions of each *cell*. When a deletion entry is inserted, it deletes all earlier versions for its cell. +- **timestamp** - the portion of the key that controls versioning. Otherwise identical keys with differing timestamps are considered to be versions of a single *cell*. Accumulo can be configured to keep the *N* newest versions of each *cell*. When a deletion entry is inserted, it deletes all earlier versions for its cell. - **value** - immutable bytes associated with a particular key. \ No newline at end of file
git commit: ACCUMULO-2755 fix merge
Repository: accumulo
Updated Branches:
refs/heads/master eb6028b9b -> f20f629f6
ACCUMULO-2755 fix merge
The new shell module
Means this test to move
Knowing your home: zen.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f20f629f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f20f629f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f20f629f
Branch: refs/heads/master
Commit: f20f629f6230c2c2669d0c23b12d830a9d9c1aca
Parents: eb6028b
Author: Mike Drob
Authored: Tue Apr 29 12:33:46 2014 -0400
Committer: Mike Drob
Committed: Tue Apr 29 12:33:46 2014 -0400
--
.../util/shell/command/HistoryCommandTest.java | 90
.../shell/command/HistoryCommandTest.java | 90
2 files changed, 90 insertions(+), 90 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f20f629f/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java
b/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java
deleted file mode 100644
index 4d379cc..000
---
a/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.util.shell.command;
-
-import static org.easymock.EasyMock.createMock;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.replay;
-import static org.junit.Assert.assertTrue;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import jline.console.ConsoleReader;
-import jline.console.history.History;
-import jline.console.history.MemoryHistory;
-
-import org.apache.accumulo.core.util.shell.Shell;
-import org.apache.accumulo.core.util.shell.commands.HistoryCommand;
-import org.apache.commons.cli.CommandLine;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
-
-public class HistoryCommandTest {
-
- HistoryCommand command;
- CommandLine cl;
-
- ByteArrayOutputStream baos;
- ConsoleReader reader;
- Shell shell;
-
- @Before
- public void setUp() throws Exception {
-command = new HistoryCommand();
-command.getOptions(); // Make sure everything is initialized
-
-cl = createMock(CommandLine.class);
-expect(cl.hasOption("c")).andReturn(false);
-expect(cl.hasOption("np")).andReturn(true);
-replay(cl);
-
-History history = new MemoryHistory();
-history.add("foo");
-history.add("bar");
-
-baos = new ByteArrayOutputStream();
-
-String input = String.format("!1%n"); // Construct a platform dependent
new-line
-reader = new ConsoleReader(new ByteArrayInputStream(input.getBytes()),
baos);
-reader.setHistory(history);
-
-shell = new Shell(reader, null);
- }
-
- @Test
- public void testCorrectNumbering() throws IOException {
-command.execute("", cl, shell);
-reader.flush();
-
-assertTrue(baos.toString().contains("2: bar"));
- }
-
- @Test
- public void testEventExpansion() throws IOException {
-// If we use an unsupported terminal, then history expansion doesn't work
because JLine can't do magic buffer manipulations.
-// This has been observed to be the case on certain versions of Eclipse.
However, mvn is usually fine.
-Assume.assumeTrue(reader.getTerminal().isSupported());
-
-reader.readLine();
-
-assertTrue(baos.toString().trim().endsWith("foo"));
- }
-
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f20f629f/shell/src/test/java/org/apache/accumulo/shell/command/HistoryCommandTest.java
--
diff --git
a/shell/src/test/java/org/apache/accumulo/shell/command/HistoryCommandTest.java
b/shell/src/test/java/org/apache/accumulo/shell/c
[1/3] git commit: ACCUMULO-2742 offset history command by one
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 0aa475895 -> 1f7dd2d53
refs/heads/master a723216a7 -> b48b13acb
ACCUMULO-2742 offset history command by one
The history entries returned by the history command are 0-indexed,
while the history expansion is 1-indexed. We need to offset the index
when we print it so that users can accurately use event expansion.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f7dd2d5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f7dd2d5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f7dd2d5
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1f7dd2d53ffebb5bac629f61caffa70c50526730
Parents: 0aa4758
Author: Mike Drob
Authored: Mon Apr 28 15:14:23 2014 -0400
Committer: Mike Drob
Committed: Mon Apr 28 23:20:35 2014 -0400
--
.../util/shell/commands/HistoryCommand.java | 31 +++
.../util/shell/command/HistoryCommandTest.java | 90
2 files changed, 102 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f7dd2d5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
index 9531d90..d6068ba 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.core.util.shell.commands;
import java.io.IOException;
import java.util.Iterator;
-import java.util.ListIterator;
import jline.console.history.History.Entry;
@@ -27,39 +26,33 @@ import org.apache.accumulo.core.util.shell.Shell.Command;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
-import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
public class HistoryCommand extends Command {
private Option clearHist;
private Option disablePaginationOpt;
- @SuppressWarnings("unchecked")
@Override
public int execute(final String fullCommand, final CommandLine cl, final
Shell shellState) throws IOException {
if (cl.hasOption(clearHist.getOpt())) {
shellState.getReader().getHistory().clear();
} else {
- ListIterator it = shellState.getReader().getHistory().entries();
- shellState.printLines(new HistoryLineIterator(it),
!cl.hasOption(disablePaginationOpt.getOpt()));
+ Iterator source = shellState.getReader().getHistory().entries();
+ Iterator historyIterator = Iterators.transform(source, new
Function() {
+@Override
+public String apply(Entry input) {
+ return String.format("%d: %s", input.index() + 1, input.value());
+}
+ });
+
+ shellState.printLines(historyIterator,
!cl.hasOption(disablePaginationOpt.getOpt()));
}
return 0;
}
- /**
- * Decorator that converts an Iterator to an Iterator.
- */
- private static class HistoryLineIterator extends AbstractIteratorDecorator {
-public HistoryLineIterator(Iterator iterator) {
- super(iterator);
-}
-
-@Override
-public String next() {
- return super.next().toString();
-}
- }
-
@Override
public String description() {
return ("generates a list of commands previously executed");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f7dd2d5/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java
b/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java
new file mode 100644
index 000..4d379cc
--- /dev/null
+++
b/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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 t
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b48b13ac
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b48b13ac
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b48b13ac
Branch: refs/heads/master
Commit: b48b13acbd51ae4e004d5a773bb18a26a491dfe8
Parents: a723216 1f7dd2d
Author: Mike Drob
Authored: Mon Apr 28 23:20:51 2014 -0400
Committer: Mike Drob
Committed: Mon Apr 28 23:20:51 2014 -0400
--
.../util/shell/command/HistoryCommandTest.java | 90
.../accumulo/shell/commands/HistoryCommand.java | 31 +++
2 files changed, 102 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b48b13ac/shell/src/main/java/org/apache/accumulo/shell/commands/HistoryCommand.java
--
diff --cc
shell/src/main/java/org/apache/accumulo/shell/commands/HistoryCommand.java
index 1c1314a,000..74817a3
mode 100644,00..100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/HistoryCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/HistoryCommand.java
@@@ -1,82 -1,0 +1,75 @@@
+/*
+ * 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.shell.commands;
+
+import java.io.IOException;
+import java.util.Iterator;
- import java.util.ListIterator;
+
+import jline.console.history.History.Entry;
+
+import org.apache.accumulo.shell.Shell;
+import org.apache.accumulo.shell.Shell.Command;
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
- import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
++
++import com.google.common.base.Function;
++import com.google.common.collect.Iterators;
+
+public class HistoryCommand extends Command {
+ private Option clearHist;
+ private Option disablePaginationOpt;
+
- @SuppressWarnings("unchecked")
+ @Override
+ public int execute(final String fullCommand, final CommandLine cl, final
Shell shellState) throws IOException {
+if (cl.hasOption(clearHist.getOpt())) {
+ shellState.getReader().getHistory().clear();
+} else {
- ListIterator it = shellState.getReader().getHistory().entries();
- shellState.printLines(new HistoryLineIterator(it),
!cl.hasOption(disablePaginationOpt.getOpt()));
++ Iterator source = shellState.getReader().getHistory().entries();
++ Iterator historyIterator = Iterators.transform(source, new
Function() {
++@Override
++public String apply(Entry input) {
++ return String.format("%d: %s", input.index() + 1, input.value());
++}
++ });
++
++ shellState.printLines(historyIterator,
!cl.hasOption(disablePaginationOpt.getOpt()));
+}
+
+return 0;
+ }
+
- /**
-* Decorator that converts an Iterator to an
Iterator.
-*/
- private static class HistoryLineIterator extends AbstractIteratorDecorator {
- public HistoryLineIterator(Iterator iterator) {
- super(iterator);
- }
-
- @Override
- public String next() {
- return super.next().toString();
- }
- }
-
+ @Override
+ public String description() {
+return ("generates a list of commands previously executed");
+ }
+
+ @Override
+ public int numArgs() {
+return 0;
+ }
+
+ @Override
+ public Options getOptions() {
+final Options o = new Options();
+clearHist = new Option("c", "clear", false, "clear history file");
+o.addOption(clearHist);
+disablePaginationOpt = new Option("np", "no-pagination", false, "disable
pagination of output");
+o.addOption(disablePaginationOpt);
+return o;
+ }
+}
[2/3] git commit: ACCUMULO-2742 offset history command by one
ACCUMULO-2742 offset history command by one
The history entries returned by the history command are 0-indexed,
while the history expansion is 1-indexed. We need to offset the index
when we print it so that users can accurately use event expansion.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f7dd2d5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f7dd2d5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f7dd2d5
Branch: refs/heads/master
Commit: 1f7dd2d53ffebb5bac629f61caffa70c50526730
Parents: 0aa4758
Author: Mike Drob
Authored: Mon Apr 28 15:14:23 2014 -0400
Committer: Mike Drob
Committed: Mon Apr 28 23:20:35 2014 -0400
--
.../util/shell/commands/HistoryCommand.java | 31 +++
.../util/shell/command/HistoryCommandTest.java | 90
2 files changed, 102 insertions(+), 19 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f7dd2d5/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
index 9531d90..d6068ba 100644
---
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
+++
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/HistoryCommand.java
@@ -18,7 +18,6 @@ package org.apache.accumulo.core.util.shell.commands;
import java.io.IOException;
import java.util.Iterator;
-import java.util.ListIterator;
import jline.console.history.History.Entry;
@@ -27,39 +26,33 @@ import org.apache.accumulo.core.util.shell.Shell.Command;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
-import org.apache.commons.collections.iterators.AbstractIteratorDecorator;
+
+import com.google.common.base.Function;
+import com.google.common.collect.Iterators;
public class HistoryCommand extends Command {
private Option clearHist;
private Option disablePaginationOpt;
- @SuppressWarnings("unchecked")
@Override
public int execute(final String fullCommand, final CommandLine cl, final
Shell shellState) throws IOException {
if (cl.hasOption(clearHist.getOpt())) {
shellState.getReader().getHistory().clear();
} else {
- ListIterator it = shellState.getReader().getHistory().entries();
- shellState.printLines(new HistoryLineIterator(it),
!cl.hasOption(disablePaginationOpt.getOpt()));
+ Iterator source = shellState.getReader().getHistory().entries();
+ Iterator historyIterator = Iterators.transform(source, new
Function() {
+@Override
+public String apply(Entry input) {
+ return String.format("%d: %s", input.index() + 1, input.value());
+}
+ });
+
+ shellState.printLines(historyIterator,
!cl.hasOption(disablePaginationOpt.getOpt()));
}
return 0;
}
- /**
- * Decorator that converts an Iterator to an Iterator.
- */
- private static class HistoryLineIterator extends AbstractIteratorDecorator {
-public HistoryLineIterator(Iterator iterator) {
- super(iterator);
-}
-
-@Override
-public String next() {
- return super.next().toString();
-}
- }
-
@Override
public String description() {
return ("generates a list of commands previously executed");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f7dd2d5/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java
b/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java
new file mode 100644
index 000..4d379cc
--- /dev/null
+++
b/core/src/test/java/org/apache/accumulo/core/util/shell/command/HistoryCommandTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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,
svn commit: r1589445 - /accumulo/site/trunk/content/glossary.mdtext
Author: mdrob Date: Wed Apr 23 15:59:02 2014 New Revision: 1589445 URL: http://svn.apache.org/r1589445 Log: CMS commit to accumulo by mdrob Modified: accumulo/site/trunk/content/glossary.mdtext Modified: accumulo/site/trunk/content/glossary.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/glossary.mdtext?rev=1589445&r1=1589444&r2=1589445&view=diff == --- accumulo/site/trunk/content/glossary.mdtext (original) +++ accumulo/site/trunk/content/glossary.mdtext Wed Apr 23 15:59:02 2014 @@ -25,7 +25,7 @@ Notice:Licensed to the Apache Softwa - **iterator** - a mechanism for modifying tablet-local portions of the key/value space. Iterators are used for standard administrative tasks as well as for custom processing. - **iterator priority** - an iterator must be configured with a particular scope and priority. When a tablet server enters that scope, it will instantiate iterators in priority order starting from the smallest priority and ending with the largest, and apply each to the data read before rewriting the data or sending the data to the user. - **iterator scopes** - the possible scopes for iterators are where the tablet server is already reading and/or writing data: minor compaction / flush time (*minc* scope), major compaction / file merging time (*majc* scope), and query time (*scan* scope) -- **gc** - process that identifies temporary files that are no longer needed by any process, and deletes them. +- **gc** - process that identifies temporary files in HDFS that are no longer needed by any process, and deletes them. - **key** - the key into the distributed sorted map which is accumulo. The key is subdivided into row, column, and timestamp. The column is further divided into family, qualifier, and visibility. - **locality group** - a set of column families that will be grouped together on disk. With no locality groups configured, data is stored on disk in row order. If each column family were configured to be its own locality group, the data for each column would be stored separately, in row order. Configuring sets of columns into locality groups is a compromise between the two approaches and will improve performance when multiple columns are accessed in the same scan. - **log-structured merge-tree** - the sorting / flushing / merging scheme on which BigTable's design is based.
svn commit: r906641 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/
Author: mdrob Date: Wed Apr 23 13:44:36 2014 New Revision: 906641 Log: Publishing svnmucc operation to accumulo site by mdrob Added: websites/production/accumulo/content/ - copied from r906640, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r906640, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r906640, websites/production/accumulo/content/1.5/apidocs/
[1/6] git commit: ACCUMULO-2716 Remove log-and-rethrow in Writer
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT a65565b43 -> c62d676e1
refs/heads/1.6.0-SNAPSHOT 5d8279604 -> 9c049a28e
refs/heads/master c8f04eb93 -> c1587d4da
ACCUMULO-2716 Remove log-and-rethrow in Writer
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c62d676e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c62d676e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c62d676e
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: c62d676e1bb3a0e0f17817f9839378c54c2e3acf
Parents: a65565b
Author: Mike Drob
Authored: Wed Apr 23 09:15:44 2014 -0400
Committer: Mike Drob
Committed: Wed Apr 23 09:15:44 2014 -0400
--
.../main/java/org/apache/accumulo/core/client/impl/Writer.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c62d676e/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
index 7353e54..b5c05aa 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.core.client.impl;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -34,11 +33,11 @@ import
org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.thrift.TServiceClient;
-import org.apache.thrift.transport.TTransportException;
public class Writer {
@@ -70,9 +69,6 @@ public class Writer {
return;
} catch (ThriftSecurityException e) {
throw new AccumuloSecurityException(e.user, e.code);
-} catch (TTransportException e) {
- log.warn("Error connecting to " + server + ": " + e);
- throw e;
} finally {
ThriftUtil.returnClient((TServiceClient) client);
}
[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9c049a28 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9c049a28 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9c049a28 Branch: refs/heads/1.6.0-SNAPSHOT Commit: 9c049a28e02781691a864c896db2ce24b2707b21 Parents: 5d82796 c62d676 Author: Mike Drob Authored: Wed Apr 23 09:16:18 2014 -0400 Committer: Mike Drob Committed: Wed Apr 23 09:16:18 2014 -0400 -- .../main/java/org/apache/accumulo/core/client/impl/Writer.java | 4 1 file changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9c049a28/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java --
[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c1587d4d Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c1587d4d Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c1587d4d Branch: refs/heads/master Commit: c1587d4da23920f1a1a00014b5b044b53a7e8b13 Parents: c8f04eb 9c049a2 Author: Mike Drob Authored: Wed Apr 23 09:16:29 2014 -0400 Committer: Mike Drob Committed: Wed Apr 23 09:16:29 2014 -0400 -- .../main/java/org/apache/accumulo/core/client/impl/Writer.java | 4 1 file changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/c1587d4d/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java --
[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9c049a28 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9c049a28 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9c049a28 Branch: refs/heads/master Commit: 9c049a28e02781691a864c896db2ce24b2707b21 Parents: 5d82796 c62d676 Author: Mike Drob Authored: Wed Apr 23 09:16:18 2014 -0400 Committer: Mike Drob Committed: Wed Apr 23 09:16:18 2014 -0400 -- .../main/java/org/apache/accumulo/core/client/impl/Writer.java | 4 1 file changed, 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/9c049a28/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java --
[2/6] git commit: ACCUMULO-2716 Remove log-and-rethrow in Writer
ACCUMULO-2716 Remove log-and-rethrow in Writer
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c62d676e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c62d676e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c62d676e
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: c62d676e1bb3a0e0f17817f9839378c54c2e3acf
Parents: a65565b
Author: Mike Drob
Authored: Wed Apr 23 09:15:44 2014 -0400
Committer: Mike Drob
Committed: Wed Apr 23 09:15:44 2014 -0400
--
.../main/java/org/apache/accumulo/core/client/impl/Writer.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c62d676e/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
index 7353e54..b5c05aa 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.core.client.impl;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -34,11 +33,11 @@ import
org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.thrift.TServiceClient;
-import org.apache.thrift.transport.TTransportException;
public class Writer {
@@ -70,9 +69,6 @@ public class Writer {
return;
} catch (ThriftSecurityException e) {
throw new AccumuloSecurityException(e.user, e.code);
-} catch (TTransportException e) {
- log.warn("Error connecting to " + server + ": " + e);
- throw e;
} finally {
ThriftUtil.returnClient((TServiceClient) client);
}
[3/6] git commit: ACCUMULO-2716 Remove log-and-rethrow in Writer
ACCUMULO-2716 Remove log-and-rethrow in Writer
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c62d676e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c62d676e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c62d676e
Branch: refs/heads/master
Commit: c62d676e1bb3a0e0f17817f9839378c54c2e3acf
Parents: a65565b
Author: Mike Drob
Authored: Wed Apr 23 09:15:44 2014 -0400
Committer: Mike Drob
Committed: Wed Apr 23 09:15:44 2014 -0400
--
.../main/java/org/apache/accumulo/core/client/impl/Writer.java | 6 +-
1 file changed, 1 insertion(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/c62d676e/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
index 7353e54..b5c05aa 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Writer.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.core.client.impl;
-import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -34,11 +33,11 @@ import
org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
import org.apache.accumulo.core.util.ArgumentChecker;
import org.apache.accumulo.core.util.ThriftUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.trace.instrument.Tracer;
import org.apache.hadoop.io.Text;
import org.apache.log4j.Logger;
import org.apache.thrift.TException;
import org.apache.thrift.TServiceClient;
-import org.apache.thrift.transport.TTransportException;
public class Writer {
@@ -70,9 +69,6 @@ public class Writer {
return;
} catch (ThriftSecurityException e) {
throw new AccumuloSecurityException(e.user, e.code);
-} catch (TTransportException e) {
- log.warn("Error connecting to " + server + ": " + e);
- throw e;
} finally {
ThriftUtil.returnClient((TServiceClient) client);
}
svn commit: r1589168 - /accumulo/site/trunk/content/glossary.mdtext
Author: mdrob Date: Tue Apr 22 15:24:32 2014 New Revision: 1589168 URL: http://svn.apache.org/r1589168 Log: ACCUMULO-2710 Commit Alex's glossary updates Modified: accumulo/site/trunk/content/glossary.mdtext Modified: accumulo/site/trunk/content/glossary.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/glossary.mdtext?rev=1589168&r1=1589167&r2=1589168&view=diff == --- accumulo/site/trunk/content/glossary.mdtext (original) +++ accumulo/site/trunk/content/glossary.mdtext Tue Apr 22 15:24:32 2014 @@ -25,15 +25,15 @@ Notice:Licensed to the Apache Softwa - **iterator** - a mechanism for modifying tablet-local portions of the key/value space. Iterators are used for standard administrative tasks as well as for custom processing. - **iterator priority** - an iterator must be configured with a particular scope and priority. When a tablet server enters that scope, it will instantiate iterators in priority order starting from the smallest priority and ending with the largest, and apply each to the data read before rewriting the data or sending the data to the user. - **iterator scopes** - the possible scopes for iterators are where the tablet server is already reading and/or writing data: minor compaction / flush time (*minc* scope), major compaction / file merging time (*majc* scope), and query time (*scan* scope) -- **gc** - +- **gc** - process that identifies temporary files that are no longer needed by any process, and deletes them. - **key** - the key into the distributed sorted map which is accumulo. The key is subdivided into row, column, and timestamp. The column is further divided into family, qualifier, and visibility. - **locality group** - a set of column families that will be grouped together on disk. With no locality groups configured, data is stored on disk in row order. If each column family were configured to be its own locality group, the data for each column would be stored separately, in row order. Configuring sets of columns into locality groups is a compromise between the two approaches and will improve performance when multiple columns are accessed in the same scan. - **log-structured merge-tree** - the sorting / flushing / merging scheme on which BigTable's design is based. -- **logger** - +- **logger** - in 1.4 and older, process that accepts updates to tablet servers and writes them to local on-disk storage for redundancy. in 1.5 the functionality was subsumed by the tablet server and datanode with HDFS writes. - **major compaction** - merging multiple files into a single file. If all of a tablet's files are merged into a single file, it is called a *full major compaction*. -- **master** - +- **master** - process that detects and responds to tablet failures, balances load across tablet servers by assigning and migrating tablets when required, coordinates table operations, and handles tablet server logistics (startup, shutdown, recovery). - **minor compaction** - flushing data from memory to disk. Usually this creates a new file for a tablet, but if the memory flushed is merge-sorted in with data from an existing file (replacing that file), it is called a *merging minor compaction*. -- **monitor** - +- **monitor** - process that displays status and usage information for all Accumulo components. - **permissions** - administrative abilities that must be given to a user such as creating tables or users and changing permissions or configuration parameters. - **row** - the portion of the key that is controls atomicity. Keys with the same row are guaranteed to remain on a single tablet hosted by a single tablet server, therefore multiple key/value pairs can be added to or removed from a row at the same time. The row is used for the primary sorting of the key. - **scan** - reading a range of key/value pairs.
[01/11] ACCUMULO-1880 create mapreduce module
Repository: accumulo
Updated Branches:
refs/heads/master a8577a1c5 -> 99baad37e
http://git-wip-us.apache.org/repos/asf/accumulo/blob/99baad37/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
--
diff --git
a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
new file mode 100644
index 000..dd531c0
--- /dev/null
+++
b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
@@ -0,0 +1,45 @@
+/*
+ * 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.mapreduce;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.hadoop.mapreduce.InputSplit;
+import org.apache.hadoop.mapreduce.JobContext;
+
+/**
+ * AccumuloInputFormat which returns an "empty" RangeInputSplit
+ */
+public class EmptySplitsAccumuloInputFormat extends AccumuloInputFormat {
+
+ @Override
+ public List getSplits(JobContext context) throws IOException {
+List oldSplits = super.getSplits(context);
+List newSplits = new ArrayList(oldSplits.size());
+
+// Copy only the necessary information
+for (InputSplit oldSplit : oldSplits) {
+ org.apache.accumulo.core.client.mapreduce.RangeInputSplit newSplit = new
org.apache.accumulo.core.client.mapreduce.RangeInputSplit(
+ (org.apache.accumulo.core.client.mapreduce.RangeInputSplit)
oldSplit);
+ newSplits.add(newSplit);
+}
+
+return newSplits;
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/99baad37/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
--
diff --git
a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
new file mode 100644
index 000..7f5c7d8
--- /dev/null
+++
b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
@@ -0,0 +1,107 @@
+/*
+ * 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.mapreduce;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.mapreduce.InputTableConfig;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.util.Pair;
+import org.apache.hadoop.io.Text;
+import org.junit.Before;
+import org.junit.Test;
+
+public class InputTableConfigTest {
+
+ private InputTableConfig tableQueryConfig;
+
+ @Before
+ public void setUp() {
+tableQueryConfig = new InputTableConfig();
+ }
+
+ @Test
+ public void testSerialization_OnlyTable() throws IOException {
+byte[] serialized = serialize(tableQueryConfig);
+InputTableConfig actualConfig = deserialize(serialized);
+
+assertEquals
[02/12] ACCUMULO-1880 create mapreduce module
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4dfcb9de/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
--
diff --git
a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
new file mode 100644
index 000..dd531c0
--- /dev/null
+++
b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/EmptySplitsAccumuloInputFormat.java
@@ -0,0 +1,45 @@
+/*
+ * 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.mapreduce;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.hadoop.mapreduce.InputSplit;
+import org.apache.hadoop.mapreduce.JobContext;
+
+/**
+ * AccumuloInputFormat which returns an "empty" RangeInputSplit
+ */
+public class EmptySplitsAccumuloInputFormat extends AccumuloInputFormat {
+
+ @Override
+ public List getSplits(JobContext context) throws IOException {
+List oldSplits = super.getSplits(context);
+List newSplits = new ArrayList(oldSplits.size());
+
+// Copy only the necessary information
+for (InputSplit oldSplit : oldSplits) {
+ org.apache.accumulo.core.client.mapreduce.RangeInputSplit newSplit = new
org.apache.accumulo.core.client.mapreduce.RangeInputSplit(
+ (org.apache.accumulo.core.client.mapreduce.RangeInputSplit)
oldSplit);
+ newSplits.add(newSplit);
+}
+
+return newSplits;
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/4dfcb9de/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
--
diff --git
a/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
new file mode 100644
index 000..7f5c7d8
--- /dev/null
+++
b/mapreduce/src/test/java/org/apache/accumulo/core/client/mapreduce/InputTableConfigTest.java
@@ -0,0 +1,107 @@
+/*
+ * 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.mapreduce;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.accumulo.core.client.IteratorSetting;
+import org.apache.accumulo.core.client.mapreduce.InputTableConfig;
+import org.apache.accumulo.core.data.Range;
+import org.apache.accumulo.core.util.Pair;
+import org.apache.hadoop.io.Text;
+import org.junit.Before;
+import org.junit.Test;
+
+public class InputTableConfigTest {
+
+ private InputTableConfig tableQueryConfig;
+
+ @Before
+ public void setUp() {
+tableQueryConfig = new InputTableConfig();
+ }
+
+ @Test
+ public void testSerialization_OnlyTable() throws IOException {
+byte[] serialized = serialize(tableQueryConfig);
+InputTableConfig actualConfig = deserialize(serialized);
+
+assertEquals(tableQueryConfig, actualConfig);
+ }
+
+ @Test
+ public void testSerialization
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b9e49cbf Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b9e49cbf Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b9e49cbf Branch: refs/heads/master Commit: b9e49cbf26b96cf0c9ff80aae9c7c8f2baaf7c4a Parents: e7534e6 8f57280 Author: Mike Drob Authored: Fri Apr 11 14:54:31 2014 -0400 Committer: Mike Drob Committed: Fri Apr 11 14:54:31 2014 -0400 -- assemble/pom.xml | 4 assemble/src/main/assemblies/component.xml | 1 + 2 files changed, 5 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b9e49cbf/assemble/pom.xml --
[1/3] git commit: ACCUMULO-2494 add commons-math to 1.6 tarball
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT 9ebb4967e -> 8f5728084
refs/heads/master e7534e6dd -> b9e49cbf2
ACCUMULO-2494 add commons-math to 1.6 tarball
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f572808
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f572808
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f572808
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 8f5728084901bcc0b0ca7e4e74f3a8ec18b0d8d2
Parents: 9ebb496
Author: Mike Drob
Authored: Fri Apr 11 14:53:29 2014 -0400
Committer: Mike Drob
Committed: Fri Apr 11 14:54:23 2014 -0400
--
assemble/pom.xml | 4
assemble/src/main/assemblies/component.xml | 1 +
2 files changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f572808/assemble/pom.xml
--
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 704107b..4c84142 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -110,6 +110,10 @@
org.apache.commons
+ commons-math
+
+
+ org.apache.commons
commons-vfs2
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f572808/assemble/src/main/assemblies/component.xml
--
diff --git a/assemble/src/main/assemblies/component.xml
b/assemble/src/main/assemblies/component.xml
index 67d83a5..747444b 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -27,6 +27,7 @@
false
${groupId}:${artifactId}-*
+org.apache.commons:commons-math
org.apache.commons:commons-vfs2
com.beust:jcommander
com.google.code.gson:gson
[2/3] git commit: ACCUMULO-2494 add commons-math to 1.6 tarball
ACCUMULO-2494 add commons-math to 1.6 tarball
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8f572808
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8f572808
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8f572808
Branch: refs/heads/master
Commit: 8f5728084901bcc0b0ca7e4e74f3a8ec18b0d8d2
Parents: 9ebb496
Author: Mike Drob
Authored: Fri Apr 11 14:53:29 2014 -0400
Committer: Mike Drob
Committed: Fri Apr 11 14:54:23 2014 -0400
--
assemble/pom.xml | 4
assemble/src/main/assemblies/component.xml | 1 +
2 files changed, 5 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f572808/assemble/pom.xml
--
diff --git a/assemble/pom.xml b/assemble/pom.xml
index 704107b..4c84142 100644
--- a/assemble/pom.xml
+++ b/assemble/pom.xml
@@ -110,6 +110,10 @@
org.apache.commons
+ commons-math
+
+
+ org.apache.commons
commons-vfs2
http://git-wip-us.apache.org/repos/asf/accumulo/blob/8f572808/assemble/src/main/assemblies/component.xml
--
diff --git a/assemble/src/main/assemblies/component.xml
b/assemble/src/main/assemblies/component.xml
index 67d83a5..747444b 100644
--- a/assemble/src/main/assemblies/component.xml
+++ b/assemble/src/main/assemblies/component.xml
@@ -27,6 +27,7 @@
false
${groupId}:${artifactId}-*
+org.apache.commons:commons-math
org.apache.commons:commons-vfs2
com.beust:jcommander
com.google.code.gson:gson
[2/3] git commit: ACCUMULO-2660 handle invocation ex in dfslogger
ACCUMULO-2660 handle invocation ex in dfslogger
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18fa298e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18fa298e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18fa298e
Branch: refs/heads/master
Commit: 18fa298e30907f12a47266886292904127b7838b
Parents: b2008ca
Author: Mike Drob
Authored: Fri Apr 11 11:37:41 2014 -0400
Committer: Mike Drob
Committed: Fri Apr 11 12:36:20 2014 -0400
--
.../apache/accumulo/tserver/log/DfsLogger.java | 22 +---
1 file changed, 19 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/18fa298e/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
--
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 55df118..c960bd6 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -26,6 +26,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.channels.ClosedChannelException;
import java.util.ArrayList;
@@ -456,9 +457,24 @@ public class DfsLogger {
try {
write(key, EMPTY);
sync.invoke(logFile);
-} catch (Exception ex) {
- log.error(ex);
- throw new IOException(ex);
+} catch (IllegalArgumentException e) {
+ log.error("Signature of sync method changed. Accumulo is likely
incompatible with this version of Hadoop.");
+ throw new RuntimeException(e);
+} catch (IllegalAccessException e) {
+ log.error("Could not invoke sync method due to permission error.");
+ throw new RuntimeException(e);
+} catch (InvocationTargetException e) {
+ Throwable cause = e.getCause();
+ if (cause instanceof IOException) {
+throw (IOException) cause;
+ } else if (cause instanceof RuntimeException) {
+throw (RuntimeException) cause;
+ } else if (cause instanceof Error) {
+throw (Error) cause;
+ } else {
+// Cause is null, or some other checked exception that was added later.
+throw new RuntimeException(e);
+ }
}
}
[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/040da03b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/040da03b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/040da03b Branch: refs/heads/master Commit: 040da03b75b5fffaf8069d4cb9cbe7429754a0cd Parents: c9f52fa 18fa298 Author: Mike Drob Authored: Fri Apr 11 12:36:40 2014 -0400 Committer: Mike Drob Committed: Fri Apr 11 12:36:40 2014 -0400 -- .../apache/accumulo/tserver/log/DfsLogger.java | 22 +--- 1 file changed, 19 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/040da03b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java -- diff --cc server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java index 571d46e,c960bd6..d4df00d --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java @@@ -26,9 -26,9 +26,10 @@@ import java.io.DataInputStream import java.io.DataOutputStream; import java.io.IOException; import java.io.OutputStream; + import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.nio.channels.ClosedChannelException; +import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections;
[1/3] git commit: ACCUMULO-2660 handle invocation ex in dfslogger
Repository: accumulo
Updated Branches:
refs/heads/1.6.0-SNAPSHOT b2008ca92 -> 18fa298e3
refs/heads/master c9f52faa7 -> 040da03b7
ACCUMULO-2660 handle invocation ex in dfslogger
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/18fa298e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/18fa298e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/18fa298e
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 18fa298e30907f12a47266886292904127b7838b
Parents: b2008ca
Author: Mike Drob
Authored: Fri Apr 11 11:37:41 2014 -0400
Committer: Mike Drob
Committed: Fri Apr 11 12:36:20 2014 -0400
--
.../apache/accumulo/tserver/log/DfsLogger.java | 22 +---
1 file changed, 19 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/18fa298e/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
--
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 55df118..c960bd6 100644
---
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@ -26,6 +26,7 @@ import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
+import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.channels.ClosedChannelException;
import java.util.ArrayList;
@@ -456,9 +457,24 @@ public class DfsLogger {
try {
write(key, EMPTY);
sync.invoke(logFile);
-} catch (Exception ex) {
- log.error(ex);
- throw new IOException(ex);
+} catch (IllegalArgumentException e) {
+ log.error("Signature of sync method changed. Accumulo is likely
incompatible with this version of Hadoop.");
+ throw new RuntimeException(e);
+} catch (IllegalAccessException e) {
+ log.error("Could not invoke sync method due to permission error.");
+ throw new RuntimeException(e);
+} catch (InvocationTargetException e) {
+ Throwable cause = e.getCause();
+ if (cause instanceof IOException) {
+throw (IOException) cause;
+ } else if (cause instanceof RuntimeException) {
+throw (RuntimeException) cause;
+ } else if (cause instanceof Error) {
+throw (Error) cause;
+ } else {
+// Cause is null, or some other checked exception that was added later.
+throw new RuntimeException(e);
+ }
}
}
[08/27] Revert "ACCUMULO-1897 Move shell into new package and module"
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2b985e2/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
new file mode 100644
index 000..43d2e12
--- /dev/null
+++
b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
@@ -0,0 +1,90 @@
+/*
+ * 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.util.shell;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+
+import jline.console.ConsoleReader;
+
+import org.apache.accumulo.core.client.security.tokens.PasswordToken;
+import org.apache.accumulo.core.util.shell.ShellTest.TestOutputStream;
+import org.apache.log4j.Level;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.beust.jcommander.ParameterException;
+
+public class ShellConfigTest {
+ TestOutputStream output;
+ Shell shell;
+ PrintStream out;
+
+ @Before
+ public void setUp() throws Exception {
+Shell.log.setLevel(Level.ERROR);
+
+out = System.out;
+output = new TestOutputStream();
+System.setOut(new PrintStream(output));
+
+shell = new Shell(new ConsoleReader(new
FileInputStream(FileDescriptor.in), output), new PrintWriter(output));
+shell.setLogErrorsToConsole();
+ }
+
+ @After
+ public void teardown() throws Exception {
+shell.shutdown();
+output.clear();
+System.setOut(out);
+ }
+
+ @Test
+ public void testHelp() {
+assertTrue(shell.config("--help"));
+assertTrue("Did not print usage", output.get().startsWith("Usage"));
+ }
+
+ @Test
+ public void testBadArg() {
+assertTrue(shell.config("--bogus"));
+assertTrue("Did not print usage", output.get().startsWith("Usage"));
+ }
+
+ @Test
+ public void testToken() {
+assertTrue(shell.config("--fake", "-tc",
PasswordToken.class.getCanonicalName()));
+
assertTrue(output.get().contains(ParameterException.class.getCanonicalName()));
+ }
+
+ @Test
+ public void testTokenAndOption() {
+assertFalse(shell.config("--fake", "-tc",
PasswordToken.class.getCanonicalName(), "-u", "foo", "-l", "password=foo"));
+ }
+
+ @Test
+ public void testTokenAndOptionAndPassword() {
+assertTrue(shell.config("--fake", "-tc",
PasswordToken.class.getCanonicalName(), "-l", "password=foo", "-p", "bar"));
+
assertTrue(output.get().contains(ParameterException.class.getCanonicalName()));
+ }
+}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2b985e2/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java
b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java
new file mode 100644
index 000..d4c0aea
--- /dev/null
+++
b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java
@@ -0,0 +1,242 @@
+/*
+ * 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.util.shell;
+
+import st
[01/27] Revert "ACCUMULO-1897 Move shell into new package and module"
Repository: accumulo Updated Branches: refs/heads/master 24f895f37 -> 066043d42 http://git-wip-us.apache.org/repos/asf/accumulo/blob/b2b985e2/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java -- diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java index bff8c3a..b3d44e3 100644 --- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java +++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java @@ -56,7 +56,7 @@ import org.apache.accumulo.core.metadata.MetadataTable; import org.apache.accumulo.core.metadata.RootTable; import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.util.UtilWaitThread; -import org.apache.accumulo.shell.Shell; +import org.apache.accumulo.core.util.shell.Shell; import org.apache.accumulo.test.functional.FunctionalTestUtils; import org.apache.accumulo.test.functional.SimpleMacIT; import org.apache.accumulo.test.functional.SlowIterator;
[21/27] ACCUMULO-1879 Move shell into new package and module
http://git-wip-us.apache.org/repos/asf/accumulo/blob/066043d4/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
deleted file mode 100644
index 43d2e12..000
---
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.util.shell;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-import jline.console.ConsoleReader;
-
-import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.util.shell.ShellTest.TestOutputStream;
-import org.apache.log4j.Level;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.beust.jcommander.ParameterException;
-
-public class ShellConfigTest {
- TestOutputStream output;
- Shell shell;
- PrintStream out;
-
- @Before
- public void setUp() throws Exception {
-Shell.log.setLevel(Level.ERROR);
-
-out = System.out;
-output = new TestOutputStream();
-System.setOut(new PrintStream(output));
-
-shell = new Shell(new ConsoleReader(new
FileInputStream(FileDescriptor.in), output), new PrintWriter(output));
-shell.setLogErrorsToConsole();
- }
-
- @After
- public void teardown() throws Exception {
-shell.shutdown();
-output.clear();
-System.setOut(out);
- }
-
- @Test
- public void testHelp() {
-assertTrue(shell.config("--help"));
-assertTrue("Did not print usage", output.get().startsWith("Usage"));
- }
-
- @Test
- public void testBadArg() {
-assertTrue(shell.config("--bogus"));
-assertTrue("Did not print usage", output.get().startsWith("Usage"));
- }
-
- @Test
- public void testToken() {
-assertTrue(shell.config("--fake", "-tc",
PasswordToken.class.getCanonicalName()));
-
assertTrue(output.get().contains(ParameterException.class.getCanonicalName()));
- }
-
- @Test
- public void testTokenAndOption() {
-assertFalse(shell.config("--fake", "-tc",
PasswordToken.class.getCanonicalName(), "-u", "foo", "-l", "password=foo"));
- }
-
- @Test
- public void testTokenAndOptionAndPassword() {
-assertTrue(shell.config("--fake", "-tc",
PasswordToken.class.getCanonicalName(), "-l", "password=foo", "-p", "bar"));
-
assertTrue(output.get().contains(ParameterException.class.getCanonicalName()));
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/066043d4/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java
b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java
deleted file mode 100644
index d4c0aea..000
---
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * 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.util.shell;
-
-i
[08/14] ACCUMULO-1897 Move shell into new package and module
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bcc9e7e4/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
deleted file mode 100644
index 43d2e12..000
---
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellConfigTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * 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.util.shell;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.PrintStream;
-import java.io.PrintWriter;
-
-import jline.console.ConsoleReader;
-
-import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.util.shell.ShellTest.TestOutputStream;
-import org.apache.log4j.Level;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-import com.beust.jcommander.ParameterException;
-
-public class ShellConfigTest {
- TestOutputStream output;
- Shell shell;
- PrintStream out;
-
- @Before
- public void setUp() throws Exception {
-Shell.log.setLevel(Level.ERROR);
-
-out = System.out;
-output = new TestOutputStream();
-System.setOut(new PrintStream(output));
-
-shell = new Shell(new ConsoleReader(new
FileInputStream(FileDescriptor.in), output), new PrintWriter(output));
-shell.setLogErrorsToConsole();
- }
-
- @After
- public void teardown() throws Exception {
-shell.shutdown();
-output.clear();
-System.setOut(out);
- }
-
- @Test
- public void testHelp() {
-assertTrue(shell.config("--help"));
-assertTrue("Did not print usage", output.get().startsWith("Usage"));
- }
-
- @Test
- public void testBadArg() {
-assertTrue(shell.config("--bogus"));
-assertTrue("Did not print usage", output.get().startsWith("Usage"));
- }
-
- @Test
- public void testToken() {
-assertTrue(shell.config("--fake", "-tc",
PasswordToken.class.getCanonicalName()));
-
assertTrue(output.get().contains(ParameterException.class.getCanonicalName()));
- }
-
- @Test
- public void testTokenAndOption() {
-assertFalse(shell.config("--fake", "-tc",
PasswordToken.class.getCanonicalName(), "-u", "foo", "-l", "password=foo"));
- }
-
- @Test
- public void testTokenAndOptionAndPassword() {
-assertTrue(shell.config("--fake", "-tc",
PasswordToken.class.getCanonicalName(), "-l", "password=foo", "-p", "bar"));
-
assertTrue(output.get().contains(ParameterException.class.getCanonicalName()));
- }
-}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/bcc9e7e4/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java
--
diff --git
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java
b/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java
deleted file mode 100644
index d4c0aea..000
---
a/core/src/test/java/org/apache/accumulo/core/util/shell/ShellSetInstanceTest.java
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * 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.util.shell;
-
-i
[01/14] Git Push Summary
Repository: accumulo Updated Branches: refs/heads/master 3a8f620d8 -> bcc9e7e41
svn commit: r905337 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/
Author: mdrob Date: Mon Apr 7 12:59:01 2014 New Revision: 905337 Log: Publishing svnmucc operation to accumulo site by mdrob Added: websites/production/accumulo/content/ - copied from r905336, websites/staging/accumulo/trunk/content/ websites/production/accumulo/content/1.4/apidocs/ - copied from r905336, websites/production/accumulo/content/1.4/apidocs/ websites/production/accumulo/content/1.5/apidocs/ - copied from r905336, websites/production/accumulo/content/1.5/apidocs/
svn commit: r1585473 - /accumulo/site/trunk/content/downloads/index.mdtext
Author: mdrob Date: Mon Apr 7 12:57:14 2014 New Revision: 1585473 URL: http://svn.apache.org/r1585473 Log: Update 1.4.5 release links Modified: accumulo/site/trunk/content/downloads/index.mdtext Modified: accumulo/site/trunk/content/downloads/index.mdtext URL: http://svn.apache.org/viewvc/accumulo/site/trunk/content/downloads/index.mdtext?rev=1585473&r1=1585472&r2=1585473&view=diff == --- accumulo/site/trunk/content/downloads/index.mdtext (original) +++ accumulo/site/trunk/content/downloads/index.mdtext Mon Apr 7 12:57:14 2014 @@ -42,13 +42,13 @@ For convenience, [MD5][22] and [SHA1][23 * javadoc * [examples][32] -## 1.4.4 (stable) -The most recent 1.4 release is 1.4.4. See the [Release Notes][12]. +## 1.4.5 (stable) +The most recent 1.4 release is 1.4.5. See the [Release Notes][12]. Be sure to verify your downloads by these [procedures][1] using these [KEYS][2]. - * Download Binaries: accumulo-1.4.4-dist.tar.gz http://www.apache.org/dyn/closer.cgi/accumulo/1.4.4/accumulo-1.4.4-dist.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.4.4-dist.tar.gz']);">mirrors ([asc][16], [md5][17], [sha][18]) - * Download Source: accumulo-1.4.4-src.tar.gz http://www.apache.org/dyn/closer.cgi/accumulo/1.4.4/accumulo-1.4.4-src.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.4.4-src.tar.gz']);">mirrors ([asc][13], [md5][14], [sha][15]) - * Read Documentation: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=419aacc45279a3cd6b3b5bf61baf486f082a450a"; onClick="javascript: _gaq.push(['_trackPageview', '/1.4/README']);">README, [html manual][19], pdf manual, [examples][20] + * Download Binaries: accumulo-1.4.5-dist.tar.gz http://www.apache.org/dyn/closer.cgi/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.4.5-dist.tar.gz']);">mirrors ([asc][16], [md5][17], [sha][18]) + * Download Source: accumulo-1.4.5-src.tar.gz http://www.apache.org/dyn/closer.cgi/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz onClick="javascript: _gaq.push(['_trackPageview', '/downloads/accumulo-1.4.5-src.tar.gz']);">mirrors ([asc][13], [md5][14], [sha][15]) + * Read Documentation: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=README;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237"; onClick="javascript: _gaq.push(['_trackPageview', '/1.4/README']);">README, [html manual][19], pdf manual, [examples][20] ## 1.3.6 The most recent 1.3 release is 1.3.6. See the [Release Notes][3]. @@ -68,13 +68,13 @@ Be sure to verify your downloads by thes [10]: http://www.apache.org/dist/accumulo/1.3.6/accumulo-1.3.6-dist.tar.gz.md5 "1.3.6 dist md5" [11]: http://www.apache.org/dist/accumulo/1.3.6/accumulo-1.3.6-dist.tar.gz.sha "1.3.6 dist sha" -[12]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=419aacc45279a3cd6b3b5bf61baf486f082a450a "1.4.4 Release Notes" -[13]: http://www.apache.org/dist/accumulo/1.4.4/accumulo-1.4.4-src.tar.gz.asc "1.4.4 src asc" -[14]: http://www.apache.org/dist/accumulo/1.4.4/accumulo-1.4.4-src.tar.gz.md5 "1.4.4 src md5" -[15]: http://www.apache.org/dist/accumulo/1.4.4/accumulo-1.4.4-src.tar.gz.sha "1.4.4 src sha" -[16]: http://www.apache.org/dist/accumulo/1.4.4/accumulo-1.4.4-dist.tar.gz.asc "1.4.4 dist asc" -[17]: http://www.apache.org/dist/accumulo/1.4.4/accumulo-1.4.4-dist.tar.gz.md5 "1.4.4 dist md5" -[18]: http://www.apache.org/dist/accumulo/1.4.4/accumulo-1.4.4-dist.tar.gz.sha "1.4.4 dist sha" +[12]: https://git-wip-us.apache.org/repos/asf?p=accumulo.git;a=blob_plain;f=CHANGES;hb=f7d87b6e407de6597b6c0ca60ca1b6a321faf237 "1.4.5 Release Notes" +[13]: http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.asc "1.4.5 src asc" +[14]: http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.md5 "1.4.5 src md5" +[15]: http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-src.tar.gz.sha "1.4.5 src sha" +[16]: http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.asc "1.4.5 dist asc" +[17]: http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.md5 "1.4.5 dist md5" +[18]: http://www.apache.org/dist/accumulo/1.4.5/accumulo-1.4.5-dist.tar.gz.sha "1.4.5 dist sha" [19]: /1.4/user_manual [20]: /1.4/examples
[5/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b6dee7fb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b6dee7fb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b6dee7fb Branch: refs/heads/1.6.0-SNAPSHOT Commit: b6dee7fbb54dc67d3b3e63610dd9a7a0273518b6 Parents: f5a94f0 ab41a5f Author: Mike Drob Authored: Fri Apr 4 18:19:55 2014 -0700 Committer: Mike Drob Committed: Fri Apr 4 18:19:55 2014 -0700 -- .../chapters/administration.tex | 37 1 file changed, 37 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6dee7fb/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex --
[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'
Merge branch '1.6.0-SNAPSHOT' Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9c3aec81 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9c3aec81 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9c3aec81 Branch: refs/heads/master Commit: 9c3aec8161be2327853405df2894f7cdde091ade Parents: ebbd5e6 b6dee7f Author: Mike Drob Authored: Fri Apr 4 18:20:04 2014 -0700 Committer: Mike Drob Committed: Fri Apr 4 18:20:04 2014 -0700 -- .../chapters/administration.tex | 37 1 file changed, 37 insertions(+) --
[1/6] git commit: ACCUMULO-2499 Added list of default ports and information about ephemeral ports.
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT 5a504b311 -> ab41a5f86
refs/heads/1.6.0-SNAPSHOT f5a94f041 -> b6dee7fbb
refs/heads/master ebbd5e62b -> 9c3aec816
ACCUMULO-2499 Added list of default ports and information about ephemeral ports.
Signed-off-by: Mike Drob
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ab41a5f8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ab41a5f8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ab41a5f8
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: ab41a5f861bfaaca39f0f13d2ae0c40a7b05a15d
Parents: 5a504b3
Author: Al Krinker
Authored: Sun Mar 23 10:30:04 2014 -0400
Committer: Mike Drob
Committed: Fri Apr 4 18:19:48 2014 -0700
--
.../chapters/administration.tex | 37
1 file changed, 37 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab41a5f8/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
--
diff --git
a/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
b/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
index 96ecf17..bb8aa70 100644
--- a/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
+++ b/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
@@ -39,6 +39,43 @@ data and control messages. In addition, Accumulo uses HDFS
clients to
communicate with HDFS. To achieve good ingest and query performance, sufficient
network bandwidth must be available between any two machines.
+In addition to needing access to ports associated with HDFS and ZooKeeper,
Accumulo will
+use the following default ports. Please make sure that they are open, or change
+their value in conf/accumulo-site.xml.
+
+\begin{table}[t]
+\centering
+\begin{tabular}{|l|c|c|}
+\hline
+Port & Description & Property Name\\
+\hline
+4445 & Shutdown Port (Accumulo MiniCluster) & n/a\\
+\hline
+4560 & Accumulo monitor (for centralized log display) & monitor.port.log4j\\
+\hline
+9997 & Tablet Server & tserver.port.client\\
+\hline
+ & Master Server & master.port.client\\
+\hline
+12234 & Accumulo Tracer & trace.port.client\\
+\hline
+42424 & Accumulo Proxy Server & n/a\\
+\hline
+50091 & Accumulo GC & gc.port.client\\
+\hline
+50095 & Accumulo HTTP monitor & monitor.port.client\\
+\hline
+\end{tabular}
+\caption{Accumulo default ports}
+\label{tab:template}
+\end{table}
+
+In addition, the user can provide '0' and an ephemeral port will be chosen
instead. This
+ephemeral port is likely to be unique and not already bound. Thus, configuring
ports to
+use '0' instead of an explicit value, should, in most cases, work around any
issues of
+running multiple distinct Accumulo instances (or any other process which tries
to use the
+same default ports) on the same hardware.
+
\section{Installation}
Choose a directory for the Accumulo installation. This directory will be
referenced
by the environment variable \texttt{\$ACCUMULO\_HOME}. Run the following:
[3/6] git commit: ACCUMULO-2499 Added list of default ports and information about ephemeral ports.
ACCUMULO-2499 Added list of default ports and information about ephemeral ports.
Signed-off-by: Mike Drob
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/ab41a5f8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/ab41a5f8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/ab41a5f8
Branch: refs/heads/master
Commit: ab41a5f861bfaaca39f0f13d2ae0c40a7b05a15d
Parents: 5a504b3
Author: Al Krinker
Authored: Sun Mar 23 10:30:04 2014 -0400
Committer: Mike Drob
Committed: Fri Apr 4 18:19:48 2014 -0700
--
.../chapters/administration.tex | 37
1 file changed, 37 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/ab41a5f8/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
--
diff --git
a/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
b/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
index 96ecf17..bb8aa70 100644
--- a/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
+++ b/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
@@ -39,6 +39,43 @@ data and control messages. In addition, Accumulo uses HDFS
clients to
communicate with HDFS. To achieve good ingest and query performance, sufficient
network bandwidth must be available between any two machines.
+In addition to needing access to ports associated with HDFS and ZooKeeper,
Accumulo will
+use the following default ports. Please make sure that they are open, or change
+their value in conf/accumulo-site.xml.
+
+\begin{table}[t]
+\centering
+\begin{tabular}{|l|c|c|}
+\hline
+Port & Description & Property Name\\
+\hline
+4445 & Shutdown Port (Accumulo MiniCluster) & n/a\\
+\hline
+4560 & Accumulo monitor (for centralized log display) & monitor.port.log4j\\
+\hline
+9997 & Tablet Server & tserver.port.client\\
+\hline
+ & Master Server & master.port.client\\
+\hline
+12234 & Accumulo Tracer & trace.port.client\\
+\hline
+42424 & Accumulo Proxy Server & n/a\\
+\hline
+50091 & Accumulo GC & gc.port.client\\
+\hline
+50095 & Accumulo HTTP monitor & monitor.port.client\\
+\hline
+\end{tabular}
+\caption{Accumulo default ports}
+\label{tab:template}
+\end{table}
+
+In addition, the user can provide '0' and an ephemeral port will be chosen
instead. This
+ephemeral port is likely to be unique and not already bound. Thus, configuring
ports to
+use '0' instead of an explicit value, should, in most cases, work around any
issues of
+running multiple distinct Accumulo instances (or any other process which tries
to use the
+same default ports) on the same hardware.
+
\section{Installation}
Choose a directory for the Accumulo installation. This directory will be
referenced
by the environment variable \texttt{\$ACCUMULO\_HOME}. Run the following:
[4/6] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT
Merge branch '1.5.2-SNAPSHOT' into 1.6.0-SNAPSHOT Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b6dee7fb Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b6dee7fb Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b6dee7fb Branch: refs/heads/master Commit: b6dee7fbb54dc67d3b3e63610dd9a7a0273518b6 Parents: f5a94f0 ab41a5f Author: Mike Drob Authored: Fri Apr 4 18:19:55 2014 -0700 Committer: Mike Drob Committed: Fri Apr 4 18:19:55 2014 -0700 -- .../chapters/administration.tex | 37 1 file changed, 37 insertions(+) -- http://git-wip-us.apache.org/repos/asf/accumulo/blob/b6dee7fb/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex --
