You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by ka...@apache.org on 2017/11/09 21:01:46 UTC
[1/2] storm git commit: [STORM-2804] Fix TopoCache is not caching
ACLs correctly problem
Repository: storm
Updated Branches:
refs/heads/master 9371685d8 -> e85e50fb8
[STORM-2804] Fix TopoCache is not caching ACLs correctly problem
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/3578cf8d
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/3578cf8d
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/3578cf8d
Branch: refs/heads/master
Commit: 3578cf8d4f4f541c1ba3e0e0d9410426908114f4
Parents: 566db74
Author: Ethan Li <et...@gmail.com>
Authored: Wed Nov 8 14:17:14 2017 -0600
Committer: Ethan Li <et...@gmail.com>
Committed: Wed Nov 8 14:17:14 2017 -0600
----------------------------------------------------------------------
.../java/org/apache/storm/daemon/nimbus/TopoCache.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/3578cf8d/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopoCache.java
----------------------------------------------------------------------
diff --git a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopoCache.java b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopoCache.java
index c7387f9..2b9de22 100644
--- a/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopoCache.java
+++ b/storm-server/src/main/java/org/apache/storm/daemon/nimbus/TopoCache.java
@@ -124,8 +124,9 @@ public class TopoCache {
throws AuthorizationException, KeyAlreadyExistsException, IOException {
final String key = ConfigUtils.masterStormCodeKey(topoId);
final List<AccessControl> acl = BlobStoreAclHandler.DEFAULT;
- store.createBlob(key, Utils.serialize(topo), new SettableBlobMeta(acl), who);
- topos.put(topoId, new WithAcl<>(acl, topo));
+ SettableBlobMeta meta = new SettableBlobMeta(acl);
+ store.createBlob(key, Utils.serialize(topo), meta, who);
+ topos.put(topoId, new WithAcl<>(meta.get_acl(), topo));
}
/**
@@ -206,8 +207,9 @@ public class TopoCache {
throws AuthorizationException, KeyAlreadyExistsException, IOException {
final String key = ConfigUtils.masterStormConfKey(topoId);
final List<AccessControl> acl = BlobStoreAclHandler.DEFAULT;
- store.createBlob(key, Utils.toCompressedJsonConf(topoConf), new SettableBlobMeta(acl), who);
- confs.put(topoId, new WithAcl<>(acl, topoConf));
+ SettableBlobMeta meta = new SettableBlobMeta(acl);
+ store.createBlob(key, Utils.toCompressedJsonConf(topoConf), meta, who);
+ confs.put(topoId, new WithAcl<>(meta.get_acl(), topoConf));
}
/**
[2/2] storm git commit: Merge branch 'STORM-2804' of
https://github.com/Ethanlm/storm into STORM-2804-merge
Posted by ka...@apache.org.
Merge branch 'STORM-2804' of https://github.com/Ethanlm/storm into STORM-2804-merge
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/e85e50fb
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/e85e50fb
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/e85e50fb
Branch: refs/heads/master
Commit: e85e50fb86c03f0fe036d13d55209d80291b96d6
Parents: 9371685 3578cf8
Author: Jungtaek Lim <ka...@gmail.com>
Authored: Fri Nov 10 06:01:34 2017 +0900
Committer: Jungtaek Lim <ka...@gmail.com>
Committed: Fri Nov 10 06:01:34 2017 +0900
----------------------------------------------------------------------
.../java/org/apache/storm/daemon/nimbus/TopoCache.java | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------