shaohongbo 3 years ago
parent
commit
cdfbfeb1f3

+ 10 - 10
src/main/java/com/persagy/apm/diagnose/service/ComputeIndicatorDataService.java

@@ -54,12 +54,12 @@ public class ComputeIndicatorDataService {
         Map<String, ProjectIndicatorCompute> projectIdAndProjectCompute = projectIndicatorComputeService.getProjectIdAndProjectCompute();
 
         List<Future<String>> futureList = new ArrayList<>();
-//        CountDownLatch latch = new CountDownLatch(projectDTOList.size());
-        CountDownLatch latch = new CountDownLatch(1);
+        CountDownLatch latch = new CountDownLatch(projectDTOList.size());
+//        CountDownLatch latch = new CountDownLatch(1);
         for (ProjectDTO projectDTO : projectDTOList) {
-            if(!projectDTO.getProjectId().equals("Pj1101060001")){
-                continue;
-            }
+//            if(!projectDTO.getProjectId().equals("Pj1101060001")){
+//                continue;
+//            }
             futureList.add(monitorIndicatorRecordService.computeIndicatorData(projectDTO, projectIdAndProjectCompute.get(projectDTO.getProjectId()), latch));
         }
         //等待所有任务执行完
@@ -80,12 +80,12 @@ public class ComputeIndicatorDataService {
             return;
         }
         List<Future<String>> futureList = new ArrayList<>();
-//        CountDownLatch latch = new CountDownLatch(projectDTOList.size());
-        CountDownLatch latch = new CountDownLatch(1);
+        CountDownLatch latch = new CountDownLatch(projectDTOList.size());
+//        CountDownLatch latch = new CountDownLatch(1);
         for (ProjectDTO projectDTO : projectDTOList) {
-            if(!projectDTO.getProjectId().equals("Pj1101060001")){
-                continue;
-            }
+//            if(!projectDTO.getProjectId().equals("Pj1101060001")){
+//                continue;
+//            }
             futureList.add(monitorIndicatorRecordService.sendIndicatorData(projectDTO, latch));
         }
         //等待所有任务执行完

+ 248 - 14
src/main/resources/hbase-site.xml

@@ -1,34 +1,268 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
-<configuration>
-	<!-- hbase-site.xml -->
+<configuration  xmlns:xi="http://www.w3.org/2001/XInclude">
+
 	<property>
-		<name>dfs.replication</name>
-		<value>1</value>
+		<name>dfs.domain.socket.path</name>
+		<value>/var/lib/hadoop-hdfs/dn_socket</value>
 	</property>
 
 	<property>
-		<name>hbase.rootdir</name>
-		<value>hdfs://namenode:8020/hbase</value>
+		<name>hbase.bulkload.staging.dir</name>
+		<value>/apps/hbase/staging</value>
+	</property>
+
+	<property>
+		<name>hbase.client.keyvalue.maxsize</name>
+		<value>1048576</value>
+	</property>
+
+	<property>
+		<name>hbase.client.retries.number</name>
+		<value>35</value>
+	</property>
+
+	<property>
+		<name>hbase.client.scanner.caching</name>
+		<value>100</value>
 	</property>
+
 	<property>
 		<name>hbase.cluster.distributed</name>
 		<value>true</value>
 	</property>
+
 	<property>
-		<name>hbase.zookeeper.quorum</name>
-		<value>zookeeper1</value>
+		<name>hbase.coprocessor.master.classes</name>
+		<value>org.apache.atlas.hbase.hook.HBaseAtlasCoprocessor,org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor</value>
+	</property>
+
+	<property>
+		<name>hbase.coprocessor.region.classes</name>
+		<value>org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor</value>
+	</property>
+
+	<property>
+		<name>hbase.coprocessor.regionserver.classes</name>
+		<value>org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor</value>
+	</property>
+
+	<property>
+		<name>hbase.defaults.for.version.skip</name>
+		<value>true</value>
+	</property>
+
+	<property>
+		<name>hbase.hregion.majorcompaction</name>
+		<value>604800000</value>
+	</property>
+
+	<property>
+		<name>hbase.hregion.majorcompaction.jitter</name>
+		<value>0.50</value>
+	</property>
+
+	<property>
+		<name>hbase.hregion.max.filesize</name>
+		<value>10737418240</value>
+	</property>
+
+	<property>
+		<name>hbase.hregion.memstore.block.multiplier</name>
+		<value>4</value>
+	</property>
+
+	<property>
+		<name>hbase.hregion.memstore.flush.size</name>
+		<value>134217728</value>
+	</property>
+
+	<property>
+		<name>hbase.hregion.memstore.mslab.enabled</name>
+		<value>true</value>
+	</property>
+
+	<property>
+		<name>hbase.hstore.blockingStoreFiles</name>
+		<value>100</value>
+	</property>
+
+	<property>
+		<name>hbase.hstore.compaction.max</name>
+		<value>10</value>
+	</property>
+
+	<property>
+		<name>hbase.hstore.compactionThreshold</name>
+		<value>3</value>
+	</property>
+
+	<property>
+		<name>hbase.local.dir</name>
+		<value>${hbase.tmp.dir}/local</value>
+	</property>
+
+	<property>
+		<name>hbase.mapreduce.bulkload.max.hfiles.perRegion.perFamily</name>
+		<value>2000</value>
+	</property>
+
+	<property>
+		<name>hbase.master.info.bindAddress</name>
+		<value>0.0.0.0</value>
+	</property>
+
+	<property>
+		<name>hbase.master.info.port</name>
+		<value>16010</value>
+	</property>
+
+	<property>
+		<name>hbase.master.namespace.init.timeout</name>
+		<value>2400000</value>
+	</property>
+
+	<property>
+		<name>hbase.master.port</name>
+		<value>16000</value>
+	</property>
+
+	<property>
+		<name>hbase.master.ui.readonly</name>
+		<value>false</value>
+	</property>
+
+	<property>
+		<name>hbase.master.wait.on.regionservers.timeout</name>
+		<value>30000</value>
+	</property>
+
+	<property>
+		<name>hbase.region.server.rpc.scheduler.factory.class</name>
+		<value>org.apache.hadoop.hbase.ipc.PhoenixRpcSchedulerFactory</value>
+	</property>
+
+	<property>
+		<name>hbase.regionserver.executor.openregion.threads</name>
+		<value>20</value>
+	</property>
+
+	<property>
+		<name>hbase.regionserver.global.memstore.size</name>
+		<value>0.4</value>
+	</property>
+
+	<property>
+		<name>hbase.regionserver.handler.count</name>
+		<value>70</value>
+	</property>
+
+	<property>
+		<name>hbase.regionserver.info.port</name>
+		<value>16030</value>
+	</property>
+
+	<property>
+		<name>hbase.regionserver.port</name>
+		<value>16020</value>
 	</property>
+
 	<property>
-		<name>hbase.zookeeper.property.dataDir</name>
-		<value>/var/zookeeper/data</value>
+		<name>hbase.regionserver.thread.compaction.small</name>
+		<value>3</value>
+	</property>
+
+	<property>
+		<name>hbase.regionserver.wal.codec</name>
+		<value>org.apache.hadoop.hbase.regionserver.wal.IndexedWALEditCodec</value>
+	</property>
+
+	<property>
+		<name>hbase.rootdir</name>
+		<value>/apps/hbase/data</value>
+	</property>
+
+	<property>
+		<name>hbase.rpc.controllerfactory.class</name>
+		<value></value>
+	</property>
+
+	<property>
+		<name>hbase.rpc.protection</name>
+		<value>authentication</value>
+	</property>
+
+	<property>
+		<name>hbase.rpc.timeout</name>
+		<value>600000</value>
 	</property>
 
-	<!--
 	<property>
 		<name>hbase.security.authentication</name>
 		<value>simple</value>
 	</property>
-	-->
+
+	<property>
+		<name>hbase.security.authorization</name>
+		<value>true</value>
+	</property>
+
+	<property>
+		<name>hbase.superuser</name>
+		<value>hbase</value>
+	</property>
+
+	<property>
+		<name>hbase.tmp.dir</name>
+		<value>/tmp/hbase-${user.name}</value>
+	</property>
+
+	<property>
+		<name>hbase.zookeeper.property.clientPort</name>
+		<value>2181</value>
+	</property>
+
+	<property>
+		<name>hbase.zookeeper.quorum</name>
+		<value>hdp-zk-40-21.wanda.prod.cn,hdp-zk-40-22.wanda.prod.cn,hdp-zk-40-23.wanda.prod.cn</value>
+	</property>
+
+	<property>
+		<name>hbase.zookeeper.useMulti</name>
+		<value>true</value>
+	</property>
+
+	<property>
+		<name>hfile.block.cache.size</name>
+		<value>0.4</value>
+	</property>
+
+	<property>
+		<name>phoenix.functions.allowUserDefinedFunctions</name>
+		<value>true</value>
+	</property>
+
+	<property>
+		<name>phoenix.query.timeoutMs</name>
+		<value>60000</value>
+	</property>
+
+	<property>
+		<name>phoenix.rpc.index.handler.count</name>
+		<value>20</value>
+	</property>
+
+	<property>
+		<name>zookeeper.recovery.retry</name>
+		<value>6</value>
+	</property>
+
+	<property>
+		<name>zookeeper.session.timeout</name>
+		<value>90000</value>
+	</property>
+
+	<property>
+		<name>zookeeper.znode.parent</name>
+		<value>/hbase-unsecure</value>
+	</property>
 
 </configuration>