Skip to content

[STORM-1506] It's better to be Integer about port of STORM_ZOOKEEPER_PORT&TRANSACTIONAL_ZOOKEEPER_PORT #1051

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hustfxj wants to merge 1 commit into from
Closed

[STORM-1506] It's better to be Integer about port of STORM_ZOOKEEPER_PORT&TRANSACTIONAL_ZOOKEEPER_PORT #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion storm-core/src/jvm/org/apache/storm/blobstore/BlobStoreUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class BlobStoreUtils {

public static CuratorFramework createZKClient(Map conf) {
List<String> zkServers = (List<String>) conf.get(Config.STORM_ZOOKEEPER_SERVERS);
Object port = conf.get(Config.STORM_ZOOKEEPER_PORT);
Integer port = (Integer)conf.get(Config.STORM_ZOOKEEPER_PORT);
ZookeeperAuthInfo zkAuthInfo = new ZookeeperAuthInfo(conf);
CuratorFramework zkClient = Utils.newCurator(conf, zkServers, port, (String) conf.get(Config.STORM_ZOOKEEPER_ROOT), zkAuthInfo);
zkClient.start();
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/org/apache/storm/transactional/state/TransactionalState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ protected TransactionalState(Map conf, String id, Map componentConf, String subr
String transactionalRoot = (String)conf.get(Config.TRANSACTIONAL_ZOOKEEPER_ROOT);
String rootDir = transactionalRoot + "/" + id + "/" + subroot;
List<String> servers = (List<String>) getWithBackup(conf, Config.TRANSACTIONAL_ZOOKEEPER_SERVERS, Config.STORM_ZOOKEEPER_SERVERS);
Object port = getWithBackup(conf, Config.TRANSACTIONAL_ZOOKEEPER_PORT, Config.STORM_ZOOKEEPER_PORT);
Integer port = (Integer)getWithBackup(conf, Config.TRANSACTIONAL_ZOOKEEPER_PORT, Config.STORM_ZOOKEEPER_PORT);
ZookeeperAuthInfo auth = new ZookeeperAuthInfo(conf);
CuratorFramework initter = Utils.newCuratorStarted(conf, servers, port, auth);
_zkAcls = Utils.getWorkerACL(conf);
Expand Down
2 changes: 1 addition & 1 deletion storm-core/src/jvm/org/apache/storm/trident/topology/state/TransactionalState.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ protected TransactionalState(Map conf, String id, String subroot) {
String transactionalRoot = (String)conf.get(Config.TRANSACTIONAL_ZOOKEEPER_ROOT);
String rootDir = transactionalRoot + "/" + id + "/" + subroot;
List<String> servers = (List<String>) getWithBackup(conf, Config.TRANSACTIONAL_ZOOKEEPER_SERVERS, Config.STORM_ZOOKEEPER_SERVERS);
Object port = getWithBackup(conf, Config.TRANSACTIONAL_ZOOKEEPER_PORT, Config.STORM_ZOOKEEPER_PORT);
Integer port = (Integer)getWithBackup(conf, Config.TRANSACTIONAL_ZOOKEEPER_PORT, Config.STORM_ZOOKEEPER_PORT);
ZookeeperAuthInfo auth = new ZookeeperAuthInfo(conf);
CuratorFramework initter = Utils.newCuratorStarted(conf, servers, port, auth);
_zkAcls = Utils.getWorkerACL(conf);
Expand Down
10 changes: 5 additions & 5 deletions storm-core/src/jvm/org/apache/storm/utils/Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -997,11 +997,11 @@ public static boolean canUserReadBlob(ReadableBlobMeta meta, String user) {
return false;
}

public static CuratorFramework newCurator(Map conf, List<String> servers, Object port, String root) {
public static CuratorFramework newCurator(Map conf, List<String> servers, Integer port, String root) {
return newCurator(conf, servers, port, root, null);
}

public static CuratorFramework newCurator(Map conf, List<String> servers, Object port, String root, ZookeeperAuthInfo auth) {
public static CuratorFramework newCurator(Map conf, List<String> servers, Integer port, String root, ZookeeperAuthInfo auth) {
List<String> serverPorts = new ArrayList<String>();
for (String zkServer : servers) {
serverPorts.add(zkServer + ":" + Utils.getInt(port));
Expand Down Expand Up @@ -1050,17 +1050,17 @@ public String getBackupConnectionString() throws Exception {
}
}

public static CuratorFramework newCurator(Map conf, List<String> servers, Object port, ZookeeperAuthInfo auth) {
public static CuratorFramework newCurator(Map conf, List<String> servers, Integer port, ZookeeperAuthInfo auth) {
return newCurator(conf, servers, port, "", auth);
}

public static CuratorFramework newCuratorStarted(Map conf, List<String> servers, Object port, String root, ZookeeperAuthInfo auth) {
public static CuratorFramework newCuratorStarted(Map conf, List<String> servers, Integer port, String root, ZookeeperAuthInfo auth) {
CuratorFramework ret = newCurator(conf, servers, port, root, auth);
ret.start();
return ret;
}

public static CuratorFramework newCuratorStarted(Map conf, List<String> servers, Object port, ZookeeperAuthInfo auth) {
public static CuratorFramework newCuratorStarted(Map conf, List<String> servers, Integer port, ZookeeperAuthInfo auth) {
CuratorFramework ret = newCurator(conf, servers, port, auth);
ret.start();
return ret;
Expand Down