You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ec...@apache.org on 2015/02/24 22:14:15 UTC
[1/3] accumulo git commit: ACCUMULO-3580 ACCUMULO-3618 disable
metadata table scanning optimizations
Repository: accumulo
Updated Branches:
refs/heads/1.5 c59b115ba -> 0c300de23
ACCUMULO-3580 ACCUMULO-3618 disable metadata table scanning optimizations
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/517757fe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/517757fe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/517757fe
Branch: refs/heads/1.5
Commit: 517757fed365a19c2d5633779e70f9617fd481a3
Parents: c92c3c4
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Feb 24 14:24:56 2015 -0500
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Feb 24 14:24:56 2015 -0500
----------------------------------------------------------------------
.../main/java/org/apache/accumulo/server/master/Master.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/517757fe/server/src/main/java/org/apache/accumulo/server/master/Master.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/master/Master.java b/server/src/main/java/org/apache/accumulo/server/master/Master.java
index abf7468..8e072e9 100644
--- a/server/src/main/java/org/apache/accumulo/server/master/Master.java
+++ b/server/src/main/java/org/apache/accumulo/server/master/Master.java
@@ -2308,8 +2308,12 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt
});
TCredentials systemAuths = SecurityConstants.getSystemCredentials();
- final TabletStateStore stores[] = {new ZooTabletStateStore(new ZooStore(zroot)), new RootTabletStateStore(instance, systemAuths, this),
- new MetaDataStateStore(instance, systemAuths, this)};
+ final TabletStateStore stores[] = {
+ new ZooTabletStateStore(new ZooStore(zroot)),
+ new RootTabletStateStore(instance, systemAuths, this),
+ // ACCUMULO-3580 ACCUMULO-3618 disable metadata table scanning optimizations
+ new MetaDataStateStore(instance, systemAuths, null)
+ };
watchers.add(new TabletGroupWatcher(stores[2], null));
watchers.add(new TabletGroupWatcher(stores[1], watchers.get(0)));
watchers.add(new TabletGroupWatcher(stores[0], watchers.get(1)));
[2/3] accumulo git commit: ACCUMULO-3580 ACCUMULO-3618 disable
metadata table scanning optimizations
Posted by ec...@apache.org.
ACCUMULO-3580 ACCUMULO-3618 disable metadata table scanning optimizations
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/57ffd19c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/57ffd19c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/57ffd19c
Branch: refs/heads/1.5
Commit: 57ffd19c11de6984bfc2123b301917c807854ca9
Parents: 517757f
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Feb 24 14:41:51 2015 -0500
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Feb 24 14:41:51 2015 -0500
----------------------------------------------------------------------
server/src/main/java/org/apache/accumulo/server/master/Master.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/57ffd19c/server/src/main/java/org/apache/accumulo/server/master/Master.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/master/Master.java b/server/src/main/java/org/apache/accumulo/server/master/Master.java
index 8e072e9..61ba7cf 100644
--- a/server/src/main/java/org/apache/accumulo/server/master/Master.java
+++ b/server/src/main/java/org/apache/accumulo/server/master/Master.java
@@ -2310,8 +2310,8 @@ public class Master implements LiveTServerSet.Listener, TableObserver, CurrentSt
TCredentials systemAuths = SecurityConstants.getSystemCredentials();
final TabletStateStore stores[] = {
new ZooTabletStateStore(new ZooStore(zroot)),
- new RootTabletStateStore(instance, systemAuths, this),
// ACCUMULO-3580 ACCUMULO-3618 disable metadata table scanning optimizations
+ new RootTabletStateStore(instance, systemAuths, null),
new MetaDataStateStore(instance, systemAuths, null)
};
watchers.add(new TabletGroupWatcher(stores[2], null));
[3/3] accumulo git commit: Merge branch '1.5' of
https://git-wip-us.apache.org/repos/asf/accumulo into 1.5
Posted by ec...@apache.org.
Merge branch '1.5' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0c300de2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c300de2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c300de2
Branch: refs/heads/1.5
Commit: 0c300de23d36391b19d0f45a41de92a7a4593444
Parents: 57ffd19 c59b115
Author: Eric C. Newton <er...@gmail.com>
Authored: Tue Feb 24 15:35:00 2015 -0500
Committer: Eric C. Newton <er...@gmail.com>
Committed: Tue Feb 24 15:35:00 2015 -0500
----------------------------------------------------------------------
.../apache/accumulo/server/master/tableOps/DeleteTable.java | 8 --------
1 file changed, 8 deletions(-)
----------------------------------------------------------------------