done

thulab · Dec 18, 2023 · d0a7dd0 · d0a7dd0
1 parent ba26ed8
commit d0a7dd0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/configuration/conf/config.properties b/configuration/conf/config.properties
@@ -50,8 +50,10 @@
 # BENCHMARK_WORK_MODE=testWithDefaultPath
 
 # 对于数据写入或查询，限制最长耗时，设置为0表示无限制，单位为ms
+# 对数据写入，最大误差约为WRITE_OPERATION_TIMEOUT_MS
+# 对数据查询，最大误差约为READ_OPERATION_TIMEOUT_MS
 # 此参数不限制预先注册元数据的耗时
-# TEST_MAX_TIME=0
+ TEST_MAX_TIME=100000
 
 # 是否启动Benchmark统计模块
 # USE_MEASUREMENT=true
@@ -109,13 +111,13 @@
 
 ############## 数据：设备、传感器、客户端 ##################
 # 设备总数
-# DEVICE_NUMBER=6000
+ DEVICE_NUMBER=60000
 
 # 实际写入设备比例，(0, 1]
 # REAL_INSERT_RATE=1.0
 
 # 每个设备的传感器总数
-# SENSOR_NUMBER=200
+ SENSOR_NUMBER=20
 
 # 各个传感器时间戳是否对齐
 # IS_SENSOR_TS_ALIGNMENT=true
@@ -306,7 +308,7 @@
 ################## 操作信息：写入参数 ###################
 # 每批每个设备写入数据行数，一行是某个设备所有传感器在某一时间戳的数据
 # 每个Batch写入数据总点数=DEVICE_NUM_PER_WRITE * SENSOR_NUMBER * BATCH_SIZE_PER_WRITE
-# BATCH_SIZE_PER_WRITE=100
+ BATCH_SIZE_PER_WRITE=10000
 
 # 每批写入设备数，必须能整除每个client被分配到的设备数
 # DEVICE_NUM_PER_WRITE=1

diff --git a/core/src/main/java/cn/edu/tsinghua/iot/benchmark/client/generate/GenerateDataMixClient.java b/core/src/main/java/cn/edu/tsinghua/iot/benchmark/client/generate/GenerateDataMixClient.java
@@ -140,6 +140,9 @@ private boolean ingestionOperation() {
           }
         }
         for (int j = 0; j < innerLoop; j++) {
+          if (isStop.get()) {
+            return true;
+          }
           IBatch batch = dataWorkLoad.getOneBatch();
           if (checkBatch(batch)) {
             dbWrapper.insertOneBatchWithCheck(batch);