..

zkkxyz · May 24, 2013 · 4c6ebe4 · 4c6ebe4
1 parent 3af8f96
commit 4c6ebe4
Show file tree

Hide file tree

Showing 41 changed files with 41 additions and 268 deletions.
diff --git a/...llector-service/src/main/java/com/jd/bdp/hydra/collector/service/CollectorSerService.java b/...llector-service/src/main/java/com/jd/bdp/hydra/collector/service/CollectorSerService.java
@@ -39,7 +39,7 @@ public void setTopic(String topic) {
         this.topic = topic;
     }
 
-    class HbaseConsumer implements MessageListener{
+    class HbaseConsumer implements MessageListener {
         @Override
         public void recieveMessages(Message message) {
             persistent(message);
@@ -52,24 +52,27 @@ public Executor getExecutor() {
     }
 
 
-    public void subscribe()throws Exception{
-        consumer.subscribe(topic,1024*1024,new HbaseConsumer()).completeSubscribe();
+    public void subscribe() throws Exception {
+        consumer.subscribe(topic, 1024 * 1024, new HbaseConsumer()).completeSubscribe();
     }
 
-    public void persistent(Message message){
-        List<Span> spanList = new ArrayList<Span>();
-        try{
-            spanList = (List)PB.parsePBBytes(message.getData());
-        }catch (Exception e){
-           log.error(e.getMessage());
+    public void persistent(Message message) {
+        List<Span> spanList;
+        try {
+            spanList = (List) PB.parsePBBytes(message.getData());
+        } catch (Exception e) {
+            log.error(e.getMessage());
+            return;
         }
-        try{
-          for(Span s : spanList){
-              insertService.addSpan(s);
-              insertService.addAnnotation(s);
-              insertService.addTrace(s);
-          }
-        }catch (Exception e){
+        try {
+            if (spanList != null) {
+                for (Span s : spanList) {
+                    insertService.addSpan(s);
+                    insertService.addAnnotation(s);
+                    insertService.addTrace(s);
+                }
+            }
+        } catch (Exception e) {
             e.printStackTrace();
             log.error(e.getMessage());
         }

diff --git a/...a-hbase/src/main/resources/hbase-site.xml → ...service/src/main/resources/hbase-site.xml b/...a-hbase/src/main/resources/hbase-site.xml → ...service/src/main/resources/hbase-site.xml
diff --git a/modules/hydra-collector-service/src/main/resources/hydra-collector-service.xml b/modules/hydra-collector-service/src/main/resources/hydra-collector-service.xml
@@ -29,7 +29,7 @@
 
     <context:property-placeholder location="classpath:conf.properties"/>
 
-    <bean id="collectorSerService" class="com.jd.bdp.hydra.collector.service.CollectorSerService" >
+    <bean id="collectorService" class="com.jd.bdp.hydra.collector.service.CollectorSerService" >
         <property name="topic" value="${metaq.topic}"></property>
     </bean>
 

diff --git a/modules/hydra-store/hydra-hbase/src/test/resources/hbase-site.xml b/modules/hydra-store/hydra-hbase/src/test/resources/hbase-site.xml
@@ -0,0 +1,10 @@
+<configuration>
+    <property>
+        <name>hbase.client.retries.number</name>
+        <value>3</value>
+    </property>
+    <property>
+        <name>hbase.zookeeper.quorum</name>
+        <value>boss,emp1,emp2</value>
+    </property>
+</configuration>
diff --git a/...integration/src/test/java/com/jd/bdp/hydra/tempTest/startCollect/StartCollectorMysql.java b/...integration/src/test/java/com/jd/bdp/hydra/tempTest/startCollect/StartCollectorMysql.java
diff --git a/...a-test-integration/src/test/java/com/jd/bdp/hydra/tempTest/startManager/StartManager.java b/...a-test-integration/src/test/java/com/jd/bdp/hydra/tempTest/startManager/StartManager.java
diff --git a/...a-test-integration/src/test/resources/hydra-collector/hydra-collector-integrationTest.xml b/...a-test-integration/src/test/resources/hydra-collector/hydra-collector-integrationTest.xml
diff --git a/...a-test-integration/src/test/resources/hydra-manager/hydra-manager-db-intergrationTest.xml b/...a-test-integration/src/test/resources/hydra-manager/hydra-manager-db-intergrationTest.xml
diff --git a/...hydra-test-integration/src/test/resources/hydra-manager/hydra-manager-integrationTest.xml b/...hydra-test-integration/src/test/resources/hydra-manager/hydra-manager-integrationTest.xml
diff --git a/...est/hydra-test-integration/src/test/resources/hydra-mysql/hydra-mysql-integrationtest.xml b/...est/hydra-test-integration/src/test/resources/hydra-mysql/hydra-mysql-integrationtest.xml
diff --git a/modules/hydra-test/hydra-test-integration/src/test/resources/log4j.xml b/modules/hydra-test/hydra-test-integration/src/test/resources/log4j.xml
diff --git a/...c/test/java/com/jd/bdp/mock/TestMock.java → ...c/main/java/com/jd/bdp/mock/TestMock.java b/...c/test/java/com/jd/bdp/mock/TestMock.java → ...c/main/java/com/jd/bdp/mock/TestMock.java
diff --git a/...p/registry/client/TestRegistryClient.java → ...p/registry/client/TestRegistryClient.java b/...p/registry/client/TestRegistryClient.java → ...p/registry/client/TestRegistryClient.java
diff --git a/...y/client/support/LeaderClientService.java → ...y/client/support/LeaderClientService.java b/...y/client/support/LeaderClientService.java → ...y/client/support/LeaderClientService.java
diff --git a/...t/java/com/jd/bdp/sending/StartHydra.java → ...n/java/com/jd/bdp/sending/StartHydra.java b/...t/java/com/jd/bdp/sending/StartHydra.java → ...n/java/com/jd/bdp/sending/StartHydra.java
diff --git a/...ava/com/jd/bdp/sending/StartRegister.java → ...ava/com/jd/bdp/sending/StartRegister.java b/...ava/com/jd/bdp/sending/StartRegister.java → ...ava/com/jd/bdp/sending/StartRegister.java
diff --git a/...d/bdp/sending/TestCollectSpanService.java → ...d/bdp/sending/TestCollectSpanService.java b/...d/bdp/sending/TestCollectSpanService.java → ...d/bdp/sending/TestCollectSpanService.java
diff --git a/...p/sending/TestCollectSpanServiceImpl.java → ...p/sending/TestCollectSpanServiceImpl.java b/...p/sending/TestCollectSpanServiceImpl.java → ...p/sending/TestCollectSpanServiceImpl.java
diff --git a/.../com/jd/bdp/sending/TestHydraService.java → .../com/jd/bdp/sending/TestHydraService.java b/.../com/jd/bdp/sending/TestHydraService.java → .../com/jd/bdp/sending/TestHydraService.java
diff --git a/...com/jd/bdp/sending/TestLeaderService.java → ...com/jd/bdp/sending/TestLeaderService.java b/...com/jd/bdp/sending/TestLeaderService.java → ...com/jd/bdp/sending/TestLeaderService.java
diff --git a/.../java/com/jd/bdp/sending/TestSending.java → .../java/com/jd/bdp/sending/TestSending.java b/.../java/com/jd/bdp/sending/TestSending.java → .../java/com/jd/bdp/sending/TestSending.java
diff --git a/.../test/java/com/jd/bdp/startUp/StartA.java → .../main/java/com/jd/bdp/startUp/StartA.java b/.../test/java/com/jd/bdp/startUp/StartA.java → .../main/java/com/jd/bdp/startUp/StartA.java
diff --git a/.../test/java/com/jd/bdp/startUp/StartB.java → .../main/java/com/jd/bdp/startUp/StartB.java b/.../test/java/com/jd/bdp/startUp/StartB.java → .../main/java/com/jd/bdp/startUp/StartB.java
diff --git a/.../test/java/com/jd/bdp/startUp/StartC.java → .../main/java/com/jd/bdp/startUp/StartC.java b/.../test/java/com/jd/bdp/startUp/StartC.java → .../main/java/com/jd/bdp/startUp/StartC.java
diff --git a/...tUp/collector/reality/startCollector.java → ...tUp/collector/reality/startCollector.java b/...tUp/collector/reality/startCollector.java → ...tUp/collector/reality/startCollector.java
diff --git a/...rtUp/collector/simulation/StartHydra.java → ...rtUp/collector/simulation/StartHydra.java b/...rtUp/collector/simulation/StartHydra.java → ...rtUp/collector/simulation/StartHydra.java
diff --git a/.../simulation/support/TestHydraService.java → .../simulation/support/TestHydraService.java b/.../simulation/support/TestHydraService.java → .../simulation/support/TestHydraService.java
diff --git a/...tartUp/manager/reality/StartRegistry.java → ...tartUp/manager/reality/StartRegistry.java b/...tartUp/manager/reality/StartRegistry.java → ...tartUp/manager/reality/StartRegistry.java
diff --git a/...tUp/manager/simulation/StartRegistry.java → ...tUp/manager/simulation/StartRegistry.java b/...tUp/manager/simulation/StartRegistry.java → ...tUp/manager/simulation/StartRegistry.java
diff --git a/...ulation/support/LeaderManagerService.java → ...ulation/support/LeaderManagerService.java b/...ulation/support/LeaderManagerService.java → ...ulation/support/LeaderManagerService.java
diff --git a/...java/com/jd/bdp/trigger/impl/Trigger.java → ...java/com/jd/bdp/trigger/impl/Trigger.java b/...java/com/jd/bdp/trigger/impl/Trigger.java → ...java/com/jd/bdp/trigger/impl/Trigger.java
diff --git a/.../resources/collector/simulation/hydra.xml → .../resources/collector/simulation/hydra.xml b/.../resources/collector/simulation/hydra.xml → .../resources/collector/simulation/hydra.xml
diff --git a/.../test/resources/dubbo-service-context.xml → .../main/resources/dubbo-service-context.xml b/.../test/resources/dubbo-service-context.xml → .../main/resources/dubbo-service-context.xml
diff --git a/...test-modules/src/test/resources/log4j.xml → ...test-modules/src/main/resources/log4j.xml b/...test-modules/src/test/resources/log4j.xml → ...test-modules/src/main/resources/log4j.xml
diff --git a/...st/resources/registry/client/registry.xml → ...in/resources/registry/client/registry.xml b/...st/resources/registry/client/registry.xml → ...in/resources/registry/client/registry.xml
diff --git a/...t/resources/registry/manager/registry.xml → ...n/resources/registry/manager/registry.xml b/...t/resources/registry/manager/registry.xml → ...n/resources/registry/manager/registry.xml
diff --git a/...ules/src/test/resources/sending/hydra.xml → ...ules/src/main/resources/sending/hydra.xml b/...ules/src/test/resources/sending/hydra.xml → ...ules/src/main/resources/sending/hydra.xml
diff --git a/...s/src/test/resources/sending/register.xml → ...s/src/main/resources/sending/register.xml b/...s/src/test/resources/sending/register.xml → ...s/src/main/resources/sending/register.xml
diff --git a/...c/test/resources/sending/test-sending.xml → ...c/main/resources/sending/test-sending.xml b/...c/test/resources/sending/test-sending.xml → ...c/main/resources/sending/test-sending.xml
diff --git a/modules/hydra-web/src/main/resources/hbase-site.xml b/modules/hydra-web/src/main/resources/hbase-site.xml
@@ -0,0 +1,10 @@
+<configuration>
+    <property>
+        <name>hbase.client.retries.number</name>
+        <value>3</value>
+    </property>
+    <property>
+        <name>hbase.zookeeper.quorum</name>
+        <value>boss,emp1,emp2</value>
+    </property>
+</configuration>
diff --git a/modules/hydra-web/src/main/resources/mysql.properties b/modules/hydra-web/src/main/resources/mysql.properties
@@ -1,3 +1,3 @@
-jdbc.url=jdbc:mysql://192.168.200.113:3306/hydra-config-test
+jdbc.url=jdbc:mysql://localhost:3306/hydra-config-test-pressure
 jdbc.username=root
 jdbc.password=root