You are viewing a plain text version of this content. The canonical link for it is here.

Posted to dev@storm.apache.org by kamleshbhatt <gi...@git.apache.org> on 2016/09/07 03:10:25 UTC

[GitHub] storm pull request #1677: STORM-1985: Admin Commands

GitHub user kamleshbhatt opened a pull request:

    https://github.com/apache/storm/pull/1677

    STORM-1985: Admin Commands

    

You can merge this pull request into a Git repository by running:

    $ git pull https://github.com/kamleshbhatt/storm master

Alternatively you can review and apply these changes as the patch at:

    https://github.com/apache/storm/pull/1677.patch

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1677
    
----
commit 5414768a1f03f03efb3b18cf1f13c28a1d661331
Author: kamleshbhatt <kb...@gmail.com>
Date:   2016-08-06T05:35:31Z

    Merge pull request #1 from apache/master
    
    Update

commit a6f807d259382093ed474d89148fa82a90117693
Author: kamleshbhatt <kb...@gmail.com>
Date:   2016-09-06T16:21:09Z

    Merge pull request #2 from apache/master
    
    Update

commit 8ebb8ca96784b565be4659fe0c9e7b19cdc6978e
Author: kamleshbhatt <kb...@gmail.com>
Date:   2016-09-07T02:57:35Z

    Admin Commands

commit 1ab0a0fa49acec384da46b7c3f557b5ed453e289
Author: kamleshbhatt <kb...@gmail.com>
Date:   2016-09-07T02:59:55Z

    Merge branch 'master' of https://github.com/kamleshbhatt/storm

----


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] storm pull request #1677: STORM-1985: Admin Commands

Posted by kamleshbhatt <gi...@git.apache.org>.

Github user kamleshbhatt commented on a diff in the pull request:

    https://github.com/apache/storm/pull/1677#discussion_r81474369
  
    --- Diff: storm-core/src/jvm/org/apache/storm/command/AdminCommands.java ---
    @@ -0,0 +1,133 @@
    +/**
    + * 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.storm.command;
    +
    +import com.google.common.base.Joiner;
    +import com.google.common.collect.Sets;
    +import org.apache.curator.framework.CuratorFramework;
    +import org.apache.storm.Config;
    +import org.apache.storm.blobstore.BlobStore;
    +import org.apache.storm.blobstore.ClientBlobStore;
    +import org.apache.storm.blobstore.KeyFilter;
    +import org.apache.storm.blobstore.LocalFsBlobStore;
    +import org.apache.storm.callback.DefaultWatcherCallBack;
    +import org.apache.storm.cluster.ClusterStateContext;
    +import org.apache.storm.cluster.ClusterUtils;
    +import org.apache.storm.cluster.DaemonType;
    +import org.apache.storm.cluster.IStormClusterState;
    +import org.apache.storm.nimbus.NimbusInfo;
    +import org.apache.storm.utils.Utils;
    +import org.apache.storm.zookeeper.Zookeeper;
    +import org.apache.zookeeper.ZooDefs;
    +import org.apache.zookeeper.data.ACL;
    +import org.slf4j.Logger;
    +import org.slf4j.LoggerFactory;
    +import org.apache.storm.utils.ConfigUtils;
    +
    +import java.util.*;
    +
    +public class AdminCommands {
    +
    +    private static final Logger LOG = LoggerFactory.getLogger(Deactivate.class);
    +    private static BlobStore nimbusBlobStore;
    +    private static IStormClusterState stormClusterState;
    +    private static CuratorFramework zk;
    +    private static Map conf;
    +
    +    public static void main(String [] args) throws Exception {
    +
    +        if (args.length == 0) {
    +            throw new IllegalArgumentException("Missing command.");
    +        }
    +        initialize();
    +        String command = args[0];
    +        String[] newArgs = Arrays.copyOfRange(args, 1, args.length);
    +        switch (command) {
    +            case "remove_corrupt_topologies":
    +                removeCorruptTopologies();
    +                break;
    +            default:
    +                throw new RuntimeException("" + command + " is not a supported admin command");
    +        }
    +
    +    }
    +
    +    private static void initialize() {
    +        Map conf = ConfigUtils.readStormConfig();
    +        BlobStore nimbusBlobStore = Utils.getNimbusBlobStore (conf, NimbusInfo.fromConf(conf));
    +        List<String> servers = (List<String>) conf.get(Config.STORM_ZOOKEEPER_SERVERS);
    +        Object port = conf.get(Config.STORM_ZOOKEEPER_PORT);
    +        List<ACL> acls = null;
    +        if (Utils.isZkAuthenticationConfiguredStormServer(conf)) {
    +            acls = adminZkAcls();
    +        }
    +        try {
    +            IStormClusterState stormClusterState = ClusterUtils.mkStormClusterState(conf, acls, new ClusterStateContext(DaemonType.NIMBUS));
    +        } catch (Exception e) {
    +            LOG.error("admin can't create stormClusterState");
    +            new RuntimeException(e);
    +        }
    +        CuratorFramework zk = Zookeeper.mkClient(conf, servers, port, "", new DefaultWatcherCallBack(),conf);
    +    }
    +
    +    // we might think of moving this method in Utils class
    +    private static List<ACL> adminZkAcls() {
    +        final List<ACL> acls = new ArrayList<>();
    +        acls.add(ZooDefs.Ids.CREATOR_ALL_ACL.get(0));
    +        acls.add(new ACL((ZooDefs.Perms.READ ^ ZooDefs.Perms.CREATE), ZooDefs.Ids.ANYONE_ID_UNSAFE));
    +        return acls;
    +    }
    +
    +    private static Set<String> getKeyListFromId( String corruptId) {
    +        Set<String> keyLists = new HashSet<>();
    +        keyLists.add(ConfigUtils.masterStormCodeKey(corruptId));
    +        keyLists.add(ConfigUtils.masterStormConfKey(corruptId));
    +        if(!ConfigUtils.isLocalMode(conf)) {
    +            ConfigUtils.masterStormJarKey(corruptId);
    +        }
    +        return keyLists;
    +    }
    +
    +    private static void removeCorruptTopologies( ) {
    +        Iterator<String> corruptTopologies = listCorruptTopologies();
    +        while(corruptTopologies.hasNext()) {
    +            String corruptId = corruptTopologies.next();
    +            stormClusterState.removeStorm(corruptId);
    +            if(nimbusBlobStore instanceof LocalFsBlobStore) {
    +                Iterator<String> blobKeys = getKeyListFromId(corruptId).iterator();
    +                while(blobKeys.hasNext()) {
    +                    stormClusterState.removeBlobstoreKey(blobKeys.next());
    +                }
    +            }
    +        }
    +    }
    +
    +    private static Iterator<String> listCorruptTopologies() {
    +        Set<String> blobStoreTopologyIds = nimbusBlobStore.filterAndListKeys(new KeyFilter<String>() {
    --- End diff --
    
    Thanks for providing these steps. I fixed the issue and updated the pull request for review. Please take a look. 
    However I had to change storm.cmd and storm-config.cmd as well to make it working. Please review these changes as well.


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---