提交 86279b65 编写于 作者: Y yong.you

fix dump upload bug

上级 da0a9c4d
...@@ -56,6 +56,11 @@ public class DumpUploader implements Initializable, LogEnabled { ...@@ -56,6 +56,11 @@ public class DumpUploader implements Initializable, LogEnabled {
@Override @Override
public void initialize() throws InitializationException { public void initialize() throws InitializationException {
m_baseDir = m_configManager.getHdfsLocalBaseDir("dump"); m_baseDir = m_configManager.getHdfsLocalBaseDir("dump");
if (!m_configManager.isLocalMode()) {
if (m_job == null) {
m_job = Threads.forGroup("Cat").start(new WriteJob());
}
}
} }
private FSDataOutputStream makeHdfsOutputStream(String path) throws IOException { private FSDataOutputStream makeHdfsOutputStream(String path) throws IOException {
...@@ -71,13 +76,6 @@ public class DumpUploader implements Initializable, LogEnabled { ...@@ -71,13 +76,6 @@ public class DumpUploader implements Initializable, LogEnabled {
m_sleepPeriod = period; m_sleepPeriod = period;
} }
public void start() {
// only start at first time and long running
if (m_job == null) {
m_job = Threads.forGroup("Cat").start(new WriteJob());
}
}
class WriteJob implements Task { class WriteJob implements Task {
private volatile boolean m_active = true; private volatile boolean m_active = true;
......
...@@ -10,6 +10,7 @@ import org.unidal.initialization.ModuleContext; ...@@ -10,6 +10,7 @@ import org.unidal.initialization.ModuleContext;
import com.dianping.cat.consumer.CatConsumerAdvancedModule; import com.dianping.cat.consumer.CatConsumerAdvancedModule;
import com.dianping.cat.consumer.CatConsumerModule; import com.dianping.cat.consumer.CatConsumerModule;
import com.dianping.cat.consumer.problem.aggregation.AggregationConfigManager; import com.dianping.cat.consumer.problem.aggregation.AggregationConfigManager;
import com.dianping.cat.hadoop.hdfs.DumpUploader;
import com.dianping.cat.message.spi.core.MessageConsumer; import com.dianping.cat.message.spi.core.MessageConsumer;
import com.dianping.cat.message.spi.core.TcpSocketReceiver; import com.dianping.cat.message.spi.core.TcpSocketReceiver;
import com.dianping.cat.report.task.DefaultTaskConsumer; import com.dianping.cat.report.task.DefaultTaskConsumer;
...@@ -29,7 +30,7 @@ public class CatHomeModule extends AbstractModule { ...@@ -29,7 +30,7 @@ public class CatHomeModule extends AbstractModule {
@Override @Override
protected void execute(ModuleContext ctx) throws Exception { protected void execute(ModuleContext ctx) throws Exception {
ServerConfigManager serverConfigManager = ctx.lookup(ServerConfigManager.class); ServerConfigManager serverConfigManager = ctx.lookup(ServerConfigManager.class);
ctx.lookup(DumpUploader.class);
ctx.lookup(MessageConsumer.class); ctx.lookup(MessageConsumer.class);
ctx.lookup(DomainNavManager.class); ctx.lookup(DomainNavManager.class);
ctx.lookup(AggregationConfigManager.class); ctx.lookup(AggregationConfigManager.class);
......
package com.dianping.cat.helper;
import java.util.Date;
import java.util.List;
import java.util.Map;
public interface Parse {
public double[] compute(Map<Date, List<double[]>> datas);
public void setDateNoUse(Date start,Date end);
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册