KYLIN-1312 Modify DeployCoprocessorCLI to remove legacy coprocessor of v1.x
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/154c5a3f Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/154c5a3f Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/154c5a3f Branch: refs/heads/2.x-staging Commit: 154c5a3f0b5a368d4737acd0060bca59c8578e69 Parents: c446f68 Author: lidongsjtu <don...@ebay.com> Authored: Thu Jan 14 13:50:40 2016 +0800 Committer: lidongsjtu <don...@ebay.com> Committed: Thu Jan 14 13:57:43 2016 +0800 ---------------------------------------------------------------------- .../storage/hbase/util/DeployCoprocessorCLI.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/kylin/blob/154c5a3f/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java ---------------------------------------------------------------------- diff --git a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java index 101abc2..5bca721 100644 --- a/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java +++ b/storage-hbase/src/main/java/org/apache/kylin/storage/hbase/util/DeployCoprocessorCLI.java @@ -62,11 +62,12 @@ import com.google.common.collect.Lists; */ public class DeployCoprocessorCLI { - private static final Logger logger = LoggerFactory.getLogger(DeployCoprocessorCLI.class); - public static final String CubeObserverClass = "org.apache.kylin.storage.hbase.cube.v1.coprocessor.observer.AggregateRegionObserver"; public static final String CubeEndpointClass = "org.apache.kylin.storage.hbase.cube.v2.coprocessor.endpoint.CubeVisitService"; + public static final String CubeObserverClassOld = "org.apache.kylin.storage.hbase.coprocessor.observer.AggregateRegionObserver"; + public static final String IIEndpointClassOld = "org.apache.kylin.storage.hbase.coprocessor.endpoint.IIEndpoint"; public static final String IIEndpointClass = "org.apache.kylin.storage.hbase.ii.coprocessor.endpoint.IIEndpoint"; + private static final Logger logger = LoggerFactory.getLogger(DeployCoprocessorCLI.class); public static void main(String[] args) throws IOException { KylinConfig kylinConfig = KylinConfig.getInstanceFromEnv(); @@ -94,7 +95,7 @@ public class DeployCoprocessorCLI { } logger.info("Will execute tables " + tableNames); - + Set<String> oldJarPaths = getCoprocessorJarPaths(hbaseAdmin, tableNames); logger.info("Old coprocessor jar: " + oldJarPaths); @@ -142,7 +143,7 @@ public class DeployCoprocessorCLI { t = t.trim(); if (t.endsWith(",")) t = t.substring(0, t.length() - 1); - + if (allTableNames.contains(t)) { result.add(t); } @@ -194,7 +195,13 @@ public class DeployCoprocessorCLI { while (desc.hasCoprocessor(IIEndpointClass)) { desc.removeCoprocessor(IIEndpointClass); } - + // remove legacy coprocessor from v1.x + while (desc.hasCoprocessor(CubeObserverClassOld)) { + desc.removeCoprocessor(CubeObserverClassOld); + } + while (desc.hasCoprocessor(IIEndpointClassOld)) { + desc.removeCoprocessor(IIEndpointClassOld); + } addCoprocessorOnHTable(desc, hdfsCoprocessorJar); hbaseAdmin.modifyTable(tableName, desc);
