[accumulo] branch master updated: Fix formatting
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push:
new 8dfbdd4 Fix formatting
8dfbdd4 is described below
commit 8dfbdd4f0884fbe62a7e72264d9873a2bf3ef92b
Author: Christopher Tubbs
AuthorDate: Fri May 4 19:24:26 2018 -0400
Fix formatting
---
.../accumulo/core/client/mapreduce/InputTableConfig.java | 3 ++-
.../org/apache/accumulo/core/client/rfile/RFileScanner.java | 3 +--
.../accumulo/core/conf/CredentialProviderFactoryShim.java| 5 +++--
.../master/balancer/BaseHostRegexTableLoadBalancerTest.java | 7 ---
.../main/java/org/apache/accumulo/tserver/TabletServer.java | 12 ++--
.../org/apache/accumulo/shell/commands/ConfigCommand.java| 2 +-
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git
a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
index d46bf07..40bdac1 100644
---
a/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
+++
b/client/mapreduce/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
@@ -375,7 +375,8 @@ public class InputTableConfig implements Writable {
return false;
if (ranges != null ? !ranges.equals(that.ranges) : that.ranges != null)
return false;
-return samplerConfig != null ? samplerConfig.equals(that.samplerConfig) :
that.samplerConfig == null;
+return samplerConfig != null ? samplerConfig.equals(that.samplerConfig)
+: that.samplerConfig == null;
}
@Override
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java
b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java
index 9c1e47c..57bc144 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileScanner.java
@@ -388,8 +388,7 @@ class RFileScanner extends ScannerOptions implements
Scanner {
throw new RuntimeException(e);
}
- iterator.seek(getRange() == null ? EMPTY_RANGE : getRange(), families,
- families.size() != 0);
+ iterator.seek(getRange() == null ? EMPTY_RANGE : getRange(), families,
families.size() != 0);
return new IteratorAdapter(iterator);
} catch (IOException e) {
diff --git
a/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
b/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
index 9e6129b..bff0bd7 100644
---
a/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
+++
b/core/src/main/java/org/apache/accumulo/core/conf/CredentialProviderFactoryShim.java
@@ -88,8 +88,9 @@ public class CredentialProviderFactoryShim {
if (null != hadoopClassesAvailable) {
// Make sure everything is initialized as expected
// Otherwise we failed to load it
- return hadoopClassesAvailable && null != getProvidersMethod && null !=
hadoopCredProviderFactory
- && null != getCredentialEntryMethod && null != getCredentialMethod;
+ return hadoopClassesAvailable && null != getProvidersMethod
+ && null != hadoopCredProviderFactory && null !=
getCredentialEntryMethod
+ && null != getCredentialMethod;
}
hadoopClassesAvailable = false;
diff --git
a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
index b2b1503..cf7eed4 100644
---
a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
+++
b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/BaseHostRegexTableLoadBalancerTest.java
@@ -310,9 +310,10 @@ public abstract class BaseHostRegexTableLoadBalancerTest
extends HostRegexTableL
&& (host.equals("192.168.0.6") || host.equals("192.168.0.7") ||
host.equals("192.168.0.8")
|| host.equals("192.168.0.9") || host.equals("192.168.0.10"))) {
return true;
-} else return tid.equals("3") && (host.equals("192.168.0.11") ||
host.equals("192.168.0.12")
-|| host.equals("192.168.0.13") || host.equals("192.168.0.14")
-|| host.equals("192.168.0.15"));
+} else
+ return tid.equals("3") && (host.equals("192.168.0.11") ||
host.equals("192.168.0.12")
+ || host.equals("192.168.0.13") || host.equals("192.168.0.14")
+ || host.equals("192.168.0.15"));
}
protected String idToTableName(Table.ID id) {
diff --git
a/server/tserver/src/main/java/org/apache/accumulo/tserver/Table
[accumulo] branch master updated (38648a4 -> cf814f0)
This is an automated email from the ASF dual-hosted git repository. mwalch pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from 38648a4 Merge branch '1.9' add 73e5a56 Remove redundant if statements add 3b8bb75 Removed redundant conditional expression add 2c54cff Remove redundant call to String.format add b4e1ff9 Remove empty no args constructors add cddd4ca Removed redundant array creation new cf814f0 Merge pull request #464 from mikewalch/redundant-code The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../accumulo/core/client/mapreduce/InputTableConfig.java | 5 + .../org/apache/accumulo/core/client/BatchWriterConfig.java | 6 +- .../org/apache/accumulo/core/client/IteratorSetting.java | 9 - .../org/apache/accumulo/core/client/admin/DiskUsage.java | 5 + .../apache/accumulo/core/client/impl/OfflineIterator.java | 2 +- .../accumulo/core/client/mock/impl/MockTabletLocator.java | 1 - .../apache/accumulo/core/client/rfile/RFileScanner.java| 2 +- .../accumulo/core/conf/CredentialProviderFactoryShim.java | 10 +++--- .../java/org/apache/accumulo/core/conf/PropertyType.java | 5 + .../main/java/org/apache/accumulo/core/data/Condition.java | 5 + .../src/main/java/org/apache/accumulo/core/data/Range.java | 4 +--- .../java/org/apache/accumulo/core/data/impl/KeyExtent.java | 14 -- .../java/org/apache/accumulo/core/file/rfile/RFile.java| 2 +- .../apache/accumulo/core/iterators/user/AgeOffFilter.java | 4 +--- .../accumulo/core/iterators/user/BigDecimalCombiner.java | 4 +--- .../accumulo/core/iterators/user/ColumnAgeOffFilter.java | 4 +--- .../accumulo/core/iterators/user/IntersectingIterator.java | 5 + .../accumulo/core/iterators/user/TimestampFilter.java | 6 +- .../accumulo/core/iterators/user/TransformingIterator.java | 2 -- .../accumulo/core/iterators/user/VisibilityFilter.java | 2 -- .../accumulo/core/security/crypto/DefaultCryptoModule.java | 2 -- .../org/apache/accumulo/core/summary/SummaryReader.java| 2 +- .../apache/accumulo/core/summary/SummarySerializer.java| 7 +-- .../main/java/org/apache/accumulo/core/util/OpTimer.java | 5 - .../accumulo/core/client/mock/MockNamespacesTest.java | 4 +--- .../java/org/apache/accumulo/core/data/ConditionTest.java | 2 +- .../org/apache/accumulo/core/file/FileOperationsTest.java | 2 -- .../apache/accumulo/core/iterators/user/FilterTest.java| 8 ++-- .../accumulo/fate/zookeeper/DistributedReadWriteLock.java | 4 +--- .../java/org/apache/accumulo/fate/zookeeper/ZooUtil.java | 5 ++--- .../org/apache/accumulo/fate/zookeeper/ZooCacheTest.java | 3 +-- .../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++-- .../apache/accumulo/server/GarbageCollectionLogger.java| 2 -- .../accumulo/server/constraints/MetadataConstraints.java | 5 + .../apache/accumulo/server/problems/ProblemReports.java| 7 +-- .../server/security/handler/KerberosAuthenticator.java | 5 + .../org/apache/accumulo/server/util/NamespacePropUtil.java | 7 ++- .../org/apache/accumulo/server/util/TablePropUtil.java | 7 ++- .../balancer/BaseHostRegexTableLoadBalancerTest.java | 8 ++-- .../server/master/balancer/TableLoadBalancerTest.java | 4 .../accumulo/monitor/rest/bulkImports/BulkImport.java | 2 -- .../apache/accumulo/monitor/rest/logs/DeadLoggerList.java | 5 - .../accumulo/monitor/rest/problems/ProblemDetail.java | 5 - .../accumulo/monitor/rest/problems/ProblemSummary.java | 5 - .../java/org/apache/accumulo/monitor/rest/scans/Scans.java | 5 - .../accumulo/monitor/rest/tables/TableInformationList.java | 5 - .../apache/accumulo/monitor/rest/tables/TablesList.java| 5 - .../accumulo/monitor/rest/trace/AddlInformation.java | 5 - .../accumulo/monitor/rest/trace/RecentTracesList.java | 5 - .../accumulo/monitor/rest/tservers/BadTabletServers.java | 5 - .../accumulo/monitor/rest/tservers/DeadServerList.java | 5 - .../apache/accumulo/monitor/rest/tservers/ServerStats.java | 5 - .../monitor/rest/tservers/ServersShuttingDown.java | 5 - .../monitor/rest/tservers/TabletServersRecovery.java | 5 - .../org/apache/accumulo/monitor/rest/zk/ZKInformation.java | 5 - .../src/main/java/org/apache/accumulo/tracer/SpanTree.java | 2 -- .../java/org/apache/accumulo/tserver/TabletServer.java | 4 ++-- .../org/apache/accumulo/shell/commands/ConfigCommand.java | 7 ++- .../java/org/apache/accumulo/shell/commands/DUCommand.java | 2 +- .../org/apache/accumul
[accumulo] 01/01: Merge pull request #464 from mikewalch/redundant-code
This is an automated email from the ASF dual-hosted git repository. mwalch pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git commit cf814f0adba83088dfd767a82de27ea3d795ae46 Merge: 38648a4 cddd4ca Author: Mike Walch AuthorDate: Fri May 4 17:45:06 2018 -0400 Merge pull request #464 from mikewalch/redundant-code Remove redundant code .../accumulo/core/client/mapreduce/InputTableConfig.java | 5 + .../org/apache/accumulo/core/client/BatchWriterConfig.java | 6 +- .../org/apache/accumulo/core/client/IteratorSetting.java | 9 - .../org/apache/accumulo/core/client/admin/DiskUsage.java | 5 + .../apache/accumulo/core/client/impl/OfflineIterator.java | 2 +- .../accumulo/core/client/mock/impl/MockTabletLocator.java | 1 - .../apache/accumulo/core/client/rfile/RFileScanner.java| 2 +- .../accumulo/core/conf/CredentialProviderFactoryShim.java | 10 +++--- .../java/org/apache/accumulo/core/conf/PropertyType.java | 5 + .../main/java/org/apache/accumulo/core/data/Condition.java | 5 + .../src/main/java/org/apache/accumulo/core/data/Range.java | 4 +--- .../java/org/apache/accumulo/core/data/impl/KeyExtent.java | 14 -- .../java/org/apache/accumulo/core/file/rfile/RFile.java| 2 +- .../apache/accumulo/core/iterators/user/AgeOffFilter.java | 4 +--- .../accumulo/core/iterators/user/BigDecimalCombiner.java | 4 +--- .../accumulo/core/iterators/user/ColumnAgeOffFilter.java | 4 +--- .../accumulo/core/iterators/user/IntersectingIterator.java | 5 + .../accumulo/core/iterators/user/TimestampFilter.java | 6 +- .../accumulo/core/iterators/user/TransformingIterator.java | 2 -- .../accumulo/core/iterators/user/VisibilityFilter.java | 2 -- .../accumulo/core/security/crypto/DefaultCryptoModule.java | 2 -- .../org/apache/accumulo/core/summary/SummaryReader.java| 2 +- .../apache/accumulo/core/summary/SummarySerializer.java| 7 +-- .../main/java/org/apache/accumulo/core/util/OpTimer.java | 5 - .../accumulo/core/client/mock/MockNamespacesTest.java | 4 +--- .../java/org/apache/accumulo/core/data/ConditionTest.java | 2 +- .../org/apache/accumulo/core/file/FileOperationsTest.java | 2 -- .../apache/accumulo/core/iterators/user/FilterTest.java| 8 ++-- .../accumulo/fate/zookeeper/DistributedReadWriteLock.java | 4 +--- .../java/org/apache/accumulo/fate/zookeeper/ZooUtil.java | 5 ++--- .../org/apache/accumulo/fate/zookeeper/ZooCacheTest.java | 3 +-- .../accumulo/minicluster/impl/MiniAccumuloClusterImpl.java | 4 ++-- .../apache/accumulo/server/GarbageCollectionLogger.java| 2 -- .../accumulo/server/constraints/MetadataConstraints.java | 5 + .../apache/accumulo/server/problems/ProblemReports.java| 7 +-- .../server/security/handler/KerberosAuthenticator.java | 5 + .../org/apache/accumulo/server/util/NamespacePropUtil.java | 7 ++- .../org/apache/accumulo/server/util/TablePropUtil.java | 7 ++- .../balancer/BaseHostRegexTableLoadBalancerTest.java | 8 ++-- .../server/master/balancer/TableLoadBalancerTest.java | 4 .../accumulo/monitor/rest/bulkImports/BulkImport.java | 2 -- .../apache/accumulo/monitor/rest/logs/DeadLoggerList.java | 5 - .../accumulo/monitor/rest/problems/ProblemDetail.java | 5 - .../accumulo/monitor/rest/problems/ProblemSummary.java | 5 - .../java/org/apache/accumulo/monitor/rest/scans/Scans.java | 5 - .../accumulo/monitor/rest/tables/TableInformationList.java | 5 - .../apache/accumulo/monitor/rest/tables/TablesList.java| 5 - .../accumulo/monitor/rest/trace/AddlInformation.java | 5 - .../accumulo/monitor/rest/trace/RecentTracesList.java | 5 - .../accumulo/monitor/rest/tservers/BadTabletServers.java | 5 - .../accumulo/monitor/rest/tservers/DeadServerList.java | 5 - .../apache/accumulo/monitor/rest/tservers/ServerStats.java | 5 - .../monitor/rest/tservers/ServersShuttingDown.java | 5 - .../monitor/rest/tservers/TabletServersRecovery.java | 5 - .../org/apache/accumulo/monitor/rest/zk/ZKInformation.java | 5 - .../src/main/java/org/apache/accumulo/tracer/SpanTree.java | 2 -- .../java/org/apache/accumulo/tserver/TabletServer.java | 4 ++-- .../org/apache/accumulo/shell/commands/ConfigCommand.java | 7 ++- .../java/org/apache/accumulo/shell/commands/DUCommand.java | 2 +- .../org/apache/accumulo/shell/commands/DebugCommand.java | 2 +- .../apache/accumulo/shell/commands/SummariesCommand.java | 2 +- .../java/org/apache/accumulo/shell/ShellOptionsJCTest.java | 2 +- .../src/test/java/org/apache/accumulo/shell/ShellTest.java | 2 +- .../main/java/org/apache/accumulo/test/DumpConfigIT.java | 3 +-- .../main/java/org/apache/accumulo/test/ImportExportIT.java | 10 +++--- .../main/java
[accumulo-website] branch master updated: Switched ASF dropdown to logo
This is an automated email from the ASF dual-hosted git repository. mwalch 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 c8dd566 Switched ASF dropdown to logo c8dd566 is described below commit c8dd566ac1348338e4186133bb58561d64354eed Author: Mike Walch AuthorDate: Fri May 4 17:29:22 2018 -0400 Switched ASF dropdown to logo --- _includes/nav.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/nav.html b/_includes/nav.html index 764499a..1eb13d6 100644 --- a/_includes/nav.html +++ b/_includes/nav.html @@ -48,7 +48,7 @@ - Apache Software Foundation + https://www.apache.org/images/feather-small.png"; width="70"/> https://www.apache.org";>Apache Homepage https://www.apache.org/licenses/";>License -- To stop receiving notification emails like this one, please contact mwa...@apache.org.
[accumulo-website] branch asf-site updated: Jekyll build from master:0fe4bf5
This is an automated email from the ASF dual-hosted git repository. mwalch 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 876a754 Jekyll build from master:0fe4bf5 876a754 is described below commit 876a7541bbcb8ecb2bc1ce9929df0d6a4902b61b Author: Mike Walch AuthorDate: Fri May 4 15:54:27 2018 -0400 Jekyll build from master:0fe4bf5 Fixed bug with search button --- feed.xml | 4 ++-- search/index.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/feed.xml b/feed.xml index 906d363..872423e 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"/> -Fri, 04 May 2018 15:09:33 -0400 -Fri, 04 May 2018 15:09:33 -0400 +Fri, 04 May 2018 15:54:14 -0400 +Fri, 04 May 2018 15:54:14 -0400 Jekyll v3.7.3 diff --git a/search/index.html b/search/index.html index bdf954f..4bc5158 100644 --- a/search/index.html +++ b/search/index.html @@ -158,7 +158,7 @@ - Search + Search -- To stop receiving notification emails like this one, please contact mwa...@apache.org.
[accumulo-website] branch master updated: Fixed bug with search button
This is an automated email from the ASF dual-hosted git repository. mwalch 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 0fe4bf5 Fixed bug with search button 0fe4bf5 is described below commit 0fe4bf5b2124aad586a6382401ba85a9fa62e508 Author: Mike Walch AuthorDate: Fri May 4 15:53:51 2018 -0400 Fixed bug with search button --- pages/search.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/search.md b/pages/search.md index 43b816a..e61f21d 100644 --- a/pages/search.md +++ b/pages/search.md @@ -11,7 +11,7 @@ Search results are limited to blog posts, release notes, and the 2.0 documentati - Search + Search -- To stop receiving notification emails like this one, please contact mwa...@apache.org.
[accumulo-website] branch master updated: Added search functionality to Accumulo website (#81)
This is an automated email from the ASF dual-hosted git repository.
mwalch 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 b360e4c Added search functionality to Accumulo website (#81)
b360e4c is described below
commit b360e4c3add1a7d94e7f1300139240de5c020be1
Author: Mike Walch
AuthorDate: Fri May 4 15:08:25 2018 -0400
Added search functionality to Accumulo website (#81)
* Search results are limited to blog posts, release notes, and
documentation for one Accumulo release
* Search is implemented in browser using javascript and lunarjs
---
_includes/nav.html | 1 +
js/search.js | 48
pages/search.md| 29 +
search_data.json | 22 ++
4 files changed, 100 insertions(+)
diff --git a/_includes/nav.html b/_includes/nav.html
index 28c68d8..764499a 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -44,6 +44,7 @@
Related
Projects
+Search
diff --git a/js/search.js b/js/search.js
new file mode 100644
index 000..5501f85
--- /dev/null
+++ b/js/search.js
@@ -0,0 +1,48 @@
+jQuery(function() {
+
+ window.idx = lunr(function () {
+this.field('id');
+this.field('title');
+this.field('content', { boost: 10 });
+this.field('categories');
+ });
+
+ window.data = $.getJSON('/search_data.json');
+
+ window.data.then(function(loaded_data){
+$.each(loaded_data, function(index, value){
+ window.idx.add($.extend({ "id": index }, value));
+});
+ });
+
+ $("#site_search").submit(function(event){
+ event.preventDefault();
+ var query = $("#search_box").val();
+ var results = window.idx.search(query);
+ display_search_results(query, results);
+ });
+
+ function display_search_results(query, results) {
+var $search_status = $("#search_status");
+var $search_results = $("#search_results");
+
+window.data.then(function(loaded_data) {
+
+ if (results.length) {
+$search_status.html('Found ' + results.length + ' results for "' +
query + '"');
+$search_results.empty();
+results.forEach(function(result) {
+ var item = loaded_data[result.ref];
+ var n = item.content.search(query) - 50
+ if (n < 0) {
+n = 0;
+ }
+ var appendString = '' +
item.title + '' + item.content.substring(n, n+100) + '';
+ $search_results.append(appendString);
+});
+ } else {
+$search_status.html('No results found!');
+ }
+});
+ }
+});
diff --git a/pages/search.md b/pages/search.md
new file mode 100644
index 000..43b816a
--- /dev/null
+++ b/pages/search.md
@@ -0,0 +1,29 @@
+---
+title: Search
+permalink: /search/
+---
+
+Search results are limited to blog posts, release notes, and the 2.0
documentation.
+
+
+
+
+
+
+
+ Search
+
+
+
+
+
+
+
+
+
+
+
+
+https://cdnjs.cloudflare.com/ajax/libs/lunr.js/1.0.0/lunr.min.js";>
+https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js";>
+
diff --git a/search_data.json b/search_data.json
new file mode 100644
index 000..91b0b62
--- /dev/null
+++ b/search_data.json
@@ -0,0 +1,22 @@
+---
+layout: null
+---
+{
+ {% for post in site.docs-2-0 %}
+"{{ post.url | slugify }}": {
+ "title": "{{ post.title | xml_escape }}",
+ "content" : "{{post.content | strip_html | strip_newlines |
remove: " " | escape | remove: "\"}}",
+ "url": " {{ post.url | xml_escape }}",
+ "categories": "{% for category in post.categories %}{{ category }}{%
unless forloop.last %}, {% endunless %}{% endfor %}"
+},
+ {% endfor %}
+ {% for post in site.posts %}
+"{{ post.url | slugify }}": {
+ "title": "{{ post.title | xml_escape }}",
+ "content" : "{{post.content | strip_html | strip_newlines |
remove: " " | escape | remove: "\"}}",
+ "url": " {{ post.url | xml_escape }}",
+ "categories": "{% for category in post.categories %}{{ category }}{%
unless forloop.last %}, {% endunless %}{% endfor %}"
+}
+{% unless forloop.last %},{% endunless %}
+ {% endfor %}
+}
--
To stop receiving notification emails like this one, please contact
mwa...@apache.org.
[accumulo] 01/01: Merge branch '1.9'
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 38648a499110cfc630c0d4a6d4ce1ae2bb8f88d9
Merge: b056117 5bf5180
Author: Keith Turner
AuthorDate: Fri May 4 14:42:27 2018 -0400
Merge branch '1.9'
.../accumulo/gc/GarbageCollectWriteAheadLogs.java | 89 +-
.../gc/GarbageCollectWriteAheadLogsTest.java | 31 +++-
2 files changed, 97 insertions(+), 23 deletions(-)
diff --cc
server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index 02da2c4,405a7a0..c8b2e4e
---
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@@ -244,6 -251,21 +251,21 @@@ public class GarbageCollectWriteAheadLo
return result;
}
+ private long removeFile(Path path) {
+ try {
+ if (!useTrash || !fs.moveToTrash(path)) {
+ fs.deleteRecursively(path);
+ }
+ return 1;
+ } catch (FileNotFoundException ex) {
- log.debug("Attempted to delete WAL {} that did not exists : {}", path,
ex.getMessage());
++ // ignored
+ } catch (IOException ex) {
+ log.error("Unable to delete wal {}", path, ex);
+ }
+
+ return 0;
+ }
+
private long removeFiles(Collection> collection, final
GCStatus status) {
for (Pair stateFile : collection) {
Path path = stateFile.getSecond();
--
To stop receiving notification emails like this one, please contact
ktur...@apache.org.
[accumulo] branch master updated (b056117 -> 38648a4)
This is an automated email from the ASF dual-hosted git repository. kturner pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/accumulo.git. from b056117 Removed redundant local variables (#462) add 5bf5180 fixes #432 Made GC clean up recovery logs (#444) new 38648a4 Merge branch '1.9' The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../accumulo/gc/GarbageCollectWriteAheadLogs.java | 89 +- .../gc/GarbageCollectWriteAheadLogsTest.java | 31 +++- 2 files changed, 97 insertions(+), 23 deletions(-) -- To stop receiving notification emails like this one, please contact ktur...@apache.org.
[accumulo] branch master updated: Removed redundant local variables (#462)
This is an automated email from the ASF dual-hosted git repository.
mwalch pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push:
new b056117 Removed redundant local variables (#462)
b056117 is described below
commit b05611758b0ee0cb3ac14ed4eaeec116b92d8378
Author: Mike Walch
AuthorDate: Fri May 4 12:47:16 2018 -0400
Removed redundant local variables (#462)
---
.../accumulo/core/client/impl/Credentials.java | 4 +--
.../accumulo/core/client/impl/MasterClient.java| 5 ++--
.../core/client/impl/ReplicationClient.java| 5 ++--
.../core/client/impl/TableOperationsImpl.java | 3 +-
.../accumulo/core/client/mock/MockScannerBase.java | 6 ++--
.../apache/accumulo/core/data/impl/KeyExtent.java | 3 +-
.../accumulo/core/file/rfile/RFileOperations.java | 4 +--
.../accumulo/core/file/rfile/bcfile/BCFile.java| 3 +-
.../core/file/rfile/bcfile/Compression.java| 21 --
.../CachingHDFSSecretKeyEncryptionStrategy.java| 3 +-
.../NonCachingSecretKeyEncryptionStrategy.java | 3 +-
.../accumulo/core/summary/SummarizerFactory.java | 3 +-
.../accumulo/core/util/LocalityGroupUtil.java | 3 +-
.../java/org/apache/accumulo/core/util/Merge.java | 7 ++---
.../util/ratelimit/SharedRateLimiterFactory.java | 3 +-
.../apache/accumulo/core/zookeeper/ZooUtil.java| 3 +-
.../accumulo/core/client/rfile/RFileTest.java | 3 +-
.../system/SourceSwitchingIteratorTest.java| 9 ++
.../accumulo/core/security/crypto/CryptoTest.java | 3 +-
.../main/java/org/apache/accumulo/fate/Fate.java | 3 +-
.../main/java/org/apache/accumulo/proxy/Proxy.java | 8 ++
.../accumulo/server/client/HdfsZooInstance.java| 3 +-
.../accumulo/server/problems/ProblemReport.java| 3 +-
.../server/replication/proto/Replication.java | 3 +-
.../apache/accumulo/server/rpc/TServerUtils.java | 3 +-
.../accumulo/server/rpc/UGIAssumingProcessor.java | 3 +-
.../accumulo/server/tables/TableManager.java | 4 +--
.../accumulo/server/util/SystemPropUtil.java | 5 ++--
.../master/balancer/ChaoticLoadBalancerTest.java | 3 +-
.../master/balancer/DefaultLoadBalancerTest.java | 6 ++--
.../apache/accumulo/gc/GarbageCollectionTest.java | 7 ++---
.../rest/tservers/TabletServerResource.java| 5 +---
.../org/apache/accumulo/tracer/ZooTraceClient.java | 3 +-
.../accumulo/tracer/AsyncSpanReceiverTest.java | 3 +-
.../apache/accumulo/tserver/CompactionQueue.java | 3 +-
.../org/apache/accumulo/tserver/FileManager.java | 3 +-
.../tserver/TabletIteratorEnvironment.java | 5 ++--
.../org/apache/accumulo/tserver/TabletServer.java | 10 ++-
.../tserver/TabletServerResourceManager.java | 3 +-
.../tserver/compaction/MajorCompactionRequest.java | 6 ++--
.../apache/accumulo/tserver/InMemoryMapTest.java | 3 +-
.../accumulo/shell/commands/CreateUserCommand.java | 3 +-
.../java/org/apache/accumulo/shell/ShellTest.java | 3 +-
.../main/java/org/apache/accumulo/start/Main.java | 10 ++-
.../start/classloader/AccumuloClassLoader.java | 4 +--
.../accumulo/harness/AccumuloClusterHarness.java | 4 +--
.../apache/accumulo/test/MetaGetsReadersIT.java| 32 ++
.../test/functional/BatchWriterFlushIT.java| 5 ++--
.../test/functional/FunctionalTestUtils.java | 5 ++--
.../accumulo/test/functional/KerberosIT.java | 3 +-
.../test/functional/MasterAssignmentIT.java| 3 +-
.../accumulo/test/functional/NativeMapIT.java | 5 ++--
.../accumulo/test/functional/ScanRangeIT.java | 9 ++
.../apache/accumulo/test/functional/SummaryIT.java | 8 ++
54 files changed, 96 insertions(+), 187 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/Credentials.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/Credentials.java
index 0967a91..b0772ca 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Credentials.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Credentials.java
@@ -167,9 +167,7 @@ public class Credentials {
: (getPrincipal().equals(other.getPrincipal()));
if (!pEq)
return false;
-boolean tEq = getToken() == null ? (other.getToken() == null)
-: (getToken().equals(other.getToken()));
-return tEq;
+return getToken() == null ? (other.getToken() == null) :
(getToken().equals(other.getToken()));
}
@Override
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java
index dfe29e5..63d721a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/MasterClient.java
@@ -67,9 +67,8 @@ p
[accumulo] branch master updated: Remove dead code in bcfile (#460)
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/master by this push:
new ffbd8c7 Remove dead code in bcfile (#460)
ffbd8c7 is described below
commit ffbd8c759300eaad92b834ec26a2aa47e7378492
Author: Mike Miller
AuthorDate: Fri May 4 12:12:41 2018 -0400
Remove dead code in bcfile (#460)
---
.../blockfile/cache/tinylfu/TinyLfuBlockCache.java | 7 +-
.../file/blockfile/impl/CachableBlockFile.java | 18 ++---
.../org/apache/accumulo/core/file/rfile/RFile.java | 4 -
.../accumulo/core/file/rfile/bcfile/BCFile.java| 93 +-
.../core/file/rfile/bcfile/CompareUtils.java | 64 ---
.../core/file/rfile/bcfile/RawComparable.java | 55 -
.../accumulo/core/file/rfile/bcfile/Utils.java | 50
7 files changed, 16 insertions(+), 275 deletions(-)
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tinylfu/TinyLfuBlockCache.java
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tinylfu/TinyLfuBlockCache.java
index 6a3bb43..fd4a554 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tinylfu/TinyLfuBlockCache.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/tinylfu/TinyLfuBlockCache.java
@@ -200,7 +200,7 @@ public final class TinyLfuBlockCache implements BlockCache {
}
}
- private Block load(String key, Loader loader, Map
resolvedDeps) {
+ private Block load(Loader loader, Map resolvedDeps) {
byte[] data = loader.load((int) Math.min(Integer.MAX_VALUE,
policy.getMaximum()), resolvedDeps);
if (data == null) {
return null;
@@ -235,7 +235,7 @@ public final class TinyLfuBlockCache implements BlockCache {
Map deps = loader.getDependencies();
Block block;
if (deps.size() == 0) {
- block = cache.get(blockName, k -> load(blockName, loader,
Collections.emptyMap()));
+ block = cache.get(blockName, k -> load(loader, Collections.emptyMap()));
} else {
// This code path exist to handle the case where dependencies may need
to be loaded. Loading
// dependencies will access the cache. Cache load functions
@@ -252,8 +252,7 @@ public final class TinyLfuBlockCache implements BlockCache {
// Use asMap because it will not increment stats, getIfPresent
recorded a miss above. Use
// computeIfAbsent because it is possible another thread loaded
// the data since this thread called getIfPresent.
-block = cache.asMap().computeIfAbsent(blockName,
-k -> load(blockName, loader, resolvedDeps));
+block = cache.asMap().computeIfAbsent(blockName, k -> load(loader,
resolvedDeps));
}
}
diff --git
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
index 27b262f..3a4a26d 100644
---
a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
+++
b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
@@ -189,7 +189,7 @@ public class CachableBlockFile {
if (serializedMetadata == null) {
tmpReader = new BCFile.Reader(fsIn, lengthSupplier.get(), conf,
accumuloConfiguration);
} else {
- tmpReader = new BCFile.Reader(serializedMetadata, fsIn, conf,
accumuloConfiguration);
+ tmpReader = new BCFile.Reader(serializedMetadata, fsIn, conf);
}
if (!bcfr.compareAndSet(null, tmpReader)) {
@@ -424,7 +424,7 @@ public class CachableBlockFile {
}
BlockReader _currBlock = getBCFile(null).getMetaBlock(blockName);
- return new BlockRead(_currBlock, _currBlock.getRawSize());
+ return new BlockRead(_currBlock);
}
@Override
@@ -440,7 +440,7 @@ public class CachableBlockFile {
}
BlockReader _currBlock = getBCFile(null).getDataBlock(offset,
compressedSize, rawSize);
- return new BlockRead(_currBlock, _currBlock.getRawSize());
+ return new BlockRead(_currBlock);
}
/**
@@ -462,7 +462,7 @@ public class CachableBlockFile {
}
BlockReader _currBlock = getBCFile().getDataBlock(blockIndex);
- return new BlockRead(_currBlock, _currBlock.getRawSize());
+ return new BlockRead(_currBlock);
}
@Override
@@ -478,7 +478,7 @@ public class CachableBlockFile {
}
BlockReader _currBlock = getBCFile().getDataBlock(offset,
compressedSize, rawSize);
- return new BlockRead(_currBlock, _currBlock.getRawSize());
+ return new BlockRead(_currBlock);
}
@Override
@@ -508,11 +508,11 @@ public class CachableBlockFile {
private final CacheEntry cb;
public CachedBlockRead(CacheEntry cb, byte buf
[accumulo] branch 1.9 updated: fixes #432 Made GC clean up recovery logs (#444)
This is an automated email from the ASF dual-hosted git repository.
kturner pushed a commit to branch 1.9
in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/1.9 by this push:
new 5bf5180 fixes #432 Made GC clean up recovery logs (#444)
5bf5180 is described below
commit 5bf5180063886603d3e7f85d6e779c8f8866b401
Author: Keith Turner
AuthorDate: Fri May 4 10:35:49 2018 -0400
fixes #432 Made GC clean up recovery logs (#444)
---
.../accumulo/gc/GarbageCollectWriteAheadLogs.java | 91 +-
.../gc/GarbageCollectWriteAheadLogsTest.java | 31 +++-
2 files changed, 98 insertions(+), 24 deletions(-)
diff --git
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
index d2acb58..405a7a0 100644
---
a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
+++
b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogs.java
@@ -47,6 +47,7 @@ import org.apache.accumulo.core.trace.Span;
import org.apache.accumulo.core.trace.Trace;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.server.AccumuloServerContext;
+import org.apache.accumulo.server.ServerConstants;
import org.apache.accumulo.server.fs.VolumeManager;
import org.apache.accumulo.server.log.WalStateManager;
import org.apache.accumulo.server.log.WalStateManager.WalMarkerException;
@@ -59,6 +60,7 @@ import
org.apache.accumulo.server.master.state.TServerInstance;
import org.apache.accumulo.server.master.state.TabletLocationState;
import org.apache.accumulo.server.master.state.TabletState;
import org.apache.accumulo.server.zookeeper.ZooReaderWriter;
+import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
import org.apache.zookeeper.KeeperException;
@@ -142,6 +144,8 @@ public class GarbageCollectWriteAheadLogs {
try {
status.currentLog.started = System.currentTimeMillis();
+ Map recoveryLogs = getSortedWALogs();
+
Map> logsByServer = new HashMap<>();
Map> logsState = new HashMap<>();
// Scan for log file info first: the order is important
@@ -164,7 +168,7 @@ public class GarbageCollectWriteAheadLogs {
Map uuidToTServer;
span = Trace.start("removeEntriesInUse");
try {
-uuidToTServer = removeEntriesInUse(logsByServer, currentServers,
logsState);
+uuidToTServer = removeEntriesInUse(logsByServer, currentServers,
logsState, recoveryLogs);
count = uuidToTServer.size();
} catch (Exception ex) {
log.error("Unable to scan metadata table", ex);
@@ -199,6 +203,9 @@ public class GarbageCollectWriteAheadLogs {
long removeStop = System.currentTimeMillis();
log.info(String.format("%d total logs removed from %d servers in %.2f
seconds", count,
logsByServer.size(), (removeStop - logEntryScanStop) / 1000.));
+
+ count = removeFiles(recoveryLogs.values());
+ log.info("{} recovery logs removed", count);
span.stop();
span = Trace.start("removeMarkers");
@@ -244,36 +251,53 @@ public class GarbageCollectWriteAheadLogs {
return result;
}
+ private long removeFile(Path path) {
+try {
+ if (!useTrash || !fs.moveToTrash(path)) {
+fs.deleteRecursively(path);
+ }
+ return 1;
+} catch (FileNotFoundException ex) {
+ log.debug("Attempted to delete WAL {} that did not exists : {}", path,
ex.getMessage());
+} catch (IOException ex) {
+ log.error("Unable to delete wal {}", path, ex);
+}
+
+return 0;
+ }
+
private long removeFiles(Collection> collection, final
GCStatus status) {
for (Pair stateFile : collection) {
Path path = stateFile.getSecond();
- log.debug("Removing " + stateFile.getFirst() + " WAL " + path);
- try {
-if (!useTrash || !fs.moveToTrash(path)) {
- fs.deleteRecursively(path);
-}
-status.currentLog.deleted++;
- } catch (FileNotFoundException ex) {
-// ignored
- } catch (IOException ex) {
-log.error("Unable to delete wal " + path + ": " + ex);
- }
+ log.debug("Removing {} WAL {}", stateFile.getFirst(), path);
+ status.currentLog.deleted += removeFile(path);
}
return status.currentLog.deleted;
}
+ private long removeFiles(Collection values) {
+long count = 0;
+for (Path path : values) {
+ log.debug("Removing recovery log {}", path);
+ count += removeFile(path);
+}
+return count;
+ }
+
private UUID path2uuid(Path path) {
return UUID.fromString(path.getName());
}
private Map
removeEntriesInUse(Map> candidates,
- Set liveServers, Map>
logsState)
- throws IOException, KeeperException, InterruptedException {
+ Set liveServers, Map>
logsState,
+ Map reco
