remove flume relevant

tis-assemble/pom.xml

@@ -62,7 +62,7 @@
 <!-- <version>2.3.2</version>-->
 <!-- </dependency>-->
 
-
+<!--
  <dependency>
  <groupId>org.apache.curator</groupId>
  <artifactId>curator-recipes</artifactId>
@@ -71,7 +71,7 @@
  <groupId>org.apache.curator</groupId>
  <artifactId>curator-client</artifactId>
  </dependency>
-
+-->
  <!--TODO： 可以的话需要将tis-datax-executor 去除掉，因为加入了datax的依赖，而现在为了方便先加入吧为了启动本地datax执行，届时可以考虑放到plugin或者单独起一个VM来执行-->
  <!-- <dependency>-->
  <!-- <groupId>com.qlangtech.tis</groupId>-->
@@ -177,7 +177,7 @@
  <artifactId>tis-manage-pojo</artifactId>
  </dependency>
 
- <!--for flume-ng-node log collector-->
+ <!--for flume-ng-node log collector
  <dependency>
  <groupId>com.qlangtech.tis</groupId>
  <artifactId>tis-logback-flume-server</artifactId>
@@ -190,6 +190,7 @@
  </exclusion>
  </exclusions>
  </dependency>
+ -->
  <!-- <dependency>-->
  <!-- <groupId>org.apache.flume</groupId>-->
  <!-- <artifactId>flume-ng-node</artifactId>-->

tis-assemble/src/main/java/com/qlangtech/tis/order/center/IndexSwapTaskflowLauncher.java

@@ -25,9 +25,12 @@
 import com.qlangtech.tis.exec.ExecuteResult;
 import com.qlangtech.tis.exec.impl.DefaultChainContext;
 import com.qlangtech.tis.extension.impl.XmlFile;
-import com.qlangtech.tis.flume.FlumeApplication;
 import com.qlangtech.tis.fullbuild.phasestatus.PhaseStatusCollection;
-import com.qlangtech.tis.fullbuild.phasestatus.impl.*;
+import com.qlangtech.tis.fullbuild.phasestatus.impl.BasicPhaseStatus;
+import com.qlangtech.tis.fullbuild.phasestatus.impl.BuildPhaseStatus;
+import com.qlangtech.tis.fullbuild.phasestatus.impl.DumpPhaseStatus;
+import com.qlangtech.tis.fullbuild.phasestatus.impl.IndexBackFlowPhaseStatus;
+import com.qlangtech.tis.fullbuild.phasestatus.impl.JoinPhaseStatus;
 import com.qlangtech.tis.realtime.transfer.IOnsListenerStatus;
 import com.qlangtech.tis.rpc.server.DefaultLoggerAppenderServiceImpl;
 import com.qlangtech.tis.rpc.server.FullBuildStatCollectorServer;
@@ -44,7 +47,11 @@
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
 import java.io.File;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
 
 //import org.apache.solr.cloud.ZkController;
 
@@ -122,7 +129,7 @@ public void contextInitialized(ServletContextEvent sce) {
  try {
  this.afterPropertiesSet();
  this.incrChannels = initIncrTransferStateCollect();
- FlumeApplication.startFlume();
+ // FlumeApplication.startFlume();
  sce.getServletContext().setAttribute(KEY_INDEX_SWAP_TASK_FLOW_LAUNCHER, this);
  } catch (Exception e) {
  throw new RuntimeException(e);

tis-assemble/src/main/java/com/qlangtech/tis/rpc/server/DefaultLoggerAppenderServiceImpl.java

@@ -18,7 +18,6 @@
 
 package com.qlangtech.tis.rpc.server;
 
-import com.qlangtech.tis.flume.TisIncrLoggerSink;
 import com.qlangtech.tis.job.common.JobParams;
 import com.qlangtech.tis.rpc.grpc.log.appender.LogAppenderGrpc;
 import com.qlangtech.tis.rpc.grpc.log.appender.LoggingEvent;
@@ -44,7 +43,7 @@ public static DefaultLoggerAppenderServiceImpl getInstance() {
  return instance;
  }
 
- private static final Logger logger = LoggerFactory.getLogger(TisIncrLoggerSink.class);
+ private static final Logger logger = LoggerFactory.getLogger(DefaultLoggerAppenderServiceImpl.class);
  private static final Map<String, Logger> loggers = new HashMap<String, Logger>();
 
  public Logger getLogger(String name) {

tis-assemble/src/main/java/com/qlangtech/tis/trigger/LockResult.java

@@ -1,30 +1,26 @@
 /**
- *  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:https://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.
+ * 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
+ * <p>
+ * http:https://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * 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 com.qlangtech.tis.trigger;
 
-import org.apache.commons.lang.StringUtils;
-import org.apache.zookeeper.data.Stat;
-
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -33,46 +29,46 @@
  * @date 2016年4月26日
  */
 public class LockResult {
- private String zkAddress;
- private String path;
- private String content;
+ private String zkAddress;
+ private String path;
+ private String content;
 
- // 节点描述信息
- private String desc;
+ // 节点描述信息
+ private String desc;
 
- public final List<String> childValus = new ArrayList<String>();
+ public final List<String> childValus = new ArrayList<String>();
 
- private final boolean editable;
+ private final boolean editable;
 
- public String getDesc() {
- return desc;
- }
+ public String getDesc() {
+ return desc;
+ }
 
- public void setDesc(String desc) {
- this.desc = desc;
- }
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
 
- public LockResult(boolean editable) {
- super();
- this.editable = editable;
- }
+ public LockResult(boolean editable) {
+ super();
+ this.editable = editable;
+ }
 
- public void addChildValue(String value) {
- this.childValus.add(value);
- }
+ public void addChildValue(String value) {
+ this.childValus.add(value);
+ }
 
- public boolean isEditable() {
- return this.editable;
- }
+ public boolean isEditable() {
+ return this.editable;
+ }
 
- private static final ThreadLocal<SimpleDateFormat> format = new ThreadLocal<SimpleDateFormat>() {
+ private static final ThreadLocal<SimpleDateFormat> format = new ThreadLocal<SimpleDateFormat>() {
 
- @Override
- protected SimpleDateFormat initialValue() {
- return new SimpleDateFormat("yyyy/MM/dd HH:mm");
- }
+ @Override
+ protected SimpleDateFormat initialValue() {
+ return new SimpleDateFormat("yyyy/MM/dd HH:mm");
+ }
 
- };
+ };
 
 // public String getCreateTime() {
 //// if (stat == null) {
@@ -90,28 +86,28 @@ protected SimpleDateFormat initialValue() {
 // // return ManageUtils.formatDateYYYYMMdd(new Date(stat.getMtime()));
 // }
 
- public String getZkAddress() {
- return zkAddress;
- }
+ public String getZkAddress() {
+ return zkAddress;
+ }
 
- public void setZkAddress(String zkAddress) {
- this.zkAddress = zkAddress;
- }
+ public void setZkAddress(String zkAddress) {
+ this.zkAddress = zkAddress;
+ }
 
- public String getPath() {
- return path;
- }
+ public String getPath() {
+ return path;
+ }
 
- public void setPath(String path) {
- this.path = path;
- }
+ public void setPath(String path) {
+ this.path = path;
+ }
 
- public String getContent() {
- return content;
- }
+ public String getContent() {
+ return content;
+ }
 
- public void setContent(String content) {
- this.content = content;
- }
+ public void setContent(String content) {
+ this.content = content;
+ }
 
 }