Skip to content

Commit 2c7ffdd

Browse files
JackShi148JackShi148
authored
remove redundant log, add debug log (#326)
1 parent 12ef195 commit 2c7ffdd

File tree

10 files changed

+27
-57
lines changed

10 files changed

+27
-57
lines changed

‎src/main/java/com/alipay/oceanbase/rpc/ObTableClient.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,8 @@ private <T> T execute(String tableName, TableExecuteCallback<T> callback, ObServ
484484
}
485485
tableParam = getTableParamWithRoute(tableName, rowKey, route);
486486
}
487-
logger.warn("[latency monitor] tableParm obTable ip:port is {}:{}", tableParam.getObTable().getIp(), tableParam.getObTable().getPort());
487+
logger.debug("tableName: {}, tableParam obTable ip:port is {}:{}",
488+
tableName, tableParam.getObTable().getIp(), tableParam.getObTable().getPort());
488489
T t = callback.execute(tableParam);
489490
resetExecuteContinuousFailureCount(tableName);
490491
return t;
@@ -570,6 +571,8 @@ private <T> T execute(String tableName, TableExecuteCallback<T> callback, ObServ
570571
logger.warn(logMessage, ex);
571572
if (ex instanceof ObTableTransportException &&
572573
((ObTableTransportException) ex).getErrorCode() == TransportCodes.BOLT_TIMEOUT) {
574+
logger.debug("client execute meet transport timeout, obTable ip:port is {}:{}",
575+
tableParam.getObTable().getIp(), tableParam.getObTable().getPort());
573576
syncRefreshMetadata(true);
574577
TableEntry entry = tableRoute.getTableEntry(tableName);
575578
long partId = tableRoute.getPartId(entry, rowKey);
@@ -700,7 +703,8 @@ private <T> T execute(String tableName, OperationExecuteCallback<T> callback,
700703
throw new ObTableException("RowKey or scan range is null");
701704
}
702705
}
703-
logger.warn("[latency monitor] tableParm obTable ip:port is {}:{}", tableParam.getObTable().getIp(), tableParam.getObTable().getPort());
706+
logger.debug("tableName: {}, tableParam obTable ip:port is {}:{}",
707+
tableName, tableParam.getObTable().getIp(), tableParam.getObTable().getPort());
704708
T t = callback.execute(tableParam);
705709
resetExecuteContinuousFailureCount(tableName);
706710
return t;
@@ -790,6 +794,8 @@ private <T> T execute(String tableName, OperationExecuteCallback<T> callback,
790794
logger.warn(logMessage, ex);
791795
if (ex instanceof ObTableTransportException &&
792796
((ObTableTransportException) ex).getErrorCode() == TransportCodes.BOLT_TIMEOUT) {
797+
logger.debug("client execute meet transport timeout, obTable ip:port is {}:{}",
798+
tableParam.getObTable().getIp(), tableParam.getObTable().getPort());
793799
syncRefreshMetadata(true);
794800
TableEntry entry = tableRoute.getTableEntry(tableName);
795801
long partId = tableRoute.getPartId(entry, callback.getRowKey());

‎src/main/java/com/alipay/oceanbase/rpc/bolt/transport/ObTableConnection.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ public void checkStatus() throws Exception {
232232
reconnect("Check connection is null");
233233
}
234234
if (connection.getChannel() == null || !connection.getChannel().isActive()) {
235-
LOGGER.warn("[latency monitor] need to reconnect server: {}:{}", obTable.getIp(), obTable.getPort());
236235
reconnect("Check connection failed for address: " + connection.getUrl());
237236
}
238237
if (!connection.getChannel().isWritable()) {

‎src/main/java/com/alipay/oceanbase/rpc/location/LocationUtil.java‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -417,10 +417,7 @@ private static TableEntry callTableEntryRefresh(ObServerAddr obServerAddr, Table
417417
Connection connection = null;
418418
TableEntry entry;
419419
try {
420-
long start = System.currentTimeMillis();
421420
connection = getMetaRefreshConnection(url, sysUA);
422-
logger.warn("[latency monitor] time to build JDBC connection: {}",
423-
System.currentTimeMillis() - start);
424421
entry = callback.execute(connection);
425422
} catch (ObTableNotExistException e) {
426423
// avoid to refresh meta for ObTableNotExistException
@@ -735,7 +732,6 @@ private static TableEntry getTableEntryFromRemote(final Connection connection,
735732
int tenantId = -1;
736733
int retryTimes = 0;
737734
long sleepTime = 100L;
738-
long start = System.currentTimeMillis();
739735
try {
740736
while (true) {
741737
try {
@@ -854,8 +850,6 @@ private static TableEntry getTableEntryFromRemote(final Connection connection,
854850
}
855851
} // end while
856852
} finally {
857-
logger.warn("[latency monitor] finish get table entry from remote, execute time: {}",
858-
System.currentTimeMillis() - start);
859853
try {
860854
if (null != rs) {
861855
rs.close();
@@ -1006,7 +1000,6 @@ public static TableEntry getTableEntryLocationInBatchFromRemote(final Connection
10061000
ObTableEntryRefreshException,
10071001
ObTableSchemaVersionMismatchException {
10081002
try {
1009-
long start = System.currentTimeMillis();
10101003
int tenantId = checkTenantExistFromRemote(connection, key);
10111004
Long[] tablets = null;
10121005
if (tableEntry.isPartitionTable()) {
@@ -1018,12 +1011,10 @@ public static TableEntry getTableEntryLocationInBatchFromRemote(final Connection
10181011
// only if the server has no distribution capacity and this table is partitioned table,
10191012
// the process of fetching lsId need to be separated with the process of fetch tablets location
10201013
// because __all_virtual_tablet_to_ls makes severe impact on performance
1021-
logger.warn("[latency monitor] refresh batch location, withLsId, {}", withLsId);
1014+
logger.debug("refresh batch location, withLsId, {}", withLsId);
10221015
if (withLsId) {
10231016
getTabletLsId(connection, tableEntry, tablets, tenantId);
10241017
}
1025-
logger.warn("[latency monitor] finish get tablet locations in batch, execute time: {}",
1026-
System.currentTimeMillis() - start);
10271018
} catch (SQLException e) {
10281019
// cannot execute sql, maybe some of the observers have been killed
10291020
RUNTIME.error(LCD.convert("01-00010"), key, tableEntry, e.getMessage());
@@ -1456,7 +1447,7 @@ private static TableEntry getTableEntryFromResultSet(TableEntryKey key, ResultSe
14561447
}
14571448
TableLocation tableLocation = new TableLocation();
14581449
tableLocation.setReplicaLocations(replicaLocations);
1459-
logger.info("refresh meta get new schema_version: {}", schemaVersion);
1450+
logger.debug("refresh meta get new schema_version: {}", schemaVersion);
14601451
if (!replicaLocations.isEmpty()) {
14611452
entry.setTableId(tableId);
14621453
entry.setTableLocation(tableLocation);

‎src/main/java/com/alipay/oceanbase/rpc/location/model/RouteTableRefresher.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ public RouteTableRefresher(ObTableClient tableClient) {
4444
* */
4545
private void doRsListCheck() {
4646
try {
47-
logger.info("[latency monitor] background refresher start");
4847
TableRoute tableRoute = tableClient.getTableRoute();
4948
ConfigServerInfo configServer = tableRoute.getConfigServerInfo();
5049
List<ObServerAddr> oldRsList = configServer.getRsList();
@@ -53,7 +52,6 @@ private void doRsListCheck() {
5352
tableClient.getRsListAcquireConnectTimeout(),
5453
tableClient.getRsListAcquireReadTimeout(), tableClient.getRsListAcquireTryTimes(),
5554
tableClient.getRsListAcquireRetryInterval());
56-
logger.info("[latency monitor] finish loadRsListForConfigServerInfo");
5755
List<ObServerAddr> newRsList = newConfigServer.getRsList();
5856
boolean needRefresh = false;
5957
if (oldRsList.size() != newRsList.size()) {
@@ -73,7 +71,6 @@ private void doRsListCheck() {
7371
}
7472
}
7573
}
76-
logger.info("[latency monitor] finish needRefresh checking, needRefresh: {}", needRefresh);
7774
if (needRefresh) {
7875
newConfigServer = LocationUtil.refreshIDC2RegionMapFroConfigServerInfo(
7976
newConfigServer, tableClient.getParamURL(),
@@ -84,7 +81,6 @@ private void doRsListCheck() {
8481
tableRoute.setConfigServerInfo(newConfigServer);
8582
tableRoute.refreshRosterByRsList(newRsList);
8683
}
87-
logger.info("[latency monitor] finish doRsListCheck");
8884
} catch (Exception e) {
8985
logger.warn("RouteTableRefresher::doRsListCheck fail", e);
9086
}

‎src/main/java/com/alipay/oceanbase/rpc/location/model/TableLocations.java‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,6 @@ public TableEntry refreshMeta(String tableName, ServerRoster serverRoster,
117117
return tableEntry;
118118
}
119119
}
120-
long start = System.currentTimeMillis();
121120
Lock lock = getMetaRefreshLock(tableName);
122121
boolean acquired = false;
123122
try {
@@ -137,18 +136,16 @@ public TableEntry refreshMeta(String tableName, ServerRoster serverRoster,
137136
}
138137
tryTimes++;
139138
try {
140-
logger.warn("[latency monitor] try to acquire refresh table meta lock, tableName: {}", tableName);
141139
if (!acquired) {
142140
acquired = lock.tryLock(tableEntryRefreshLockTimeout, TimeUnit.MILLISECONDS);
143141
}
144142
if (!acquired) {
145143
String errMsg = "try to lock tableEntry refreshing timeout, tableName:" + tableName
146144
+ " , timeout:" + tableEntryRefreshLockTimeout + ".";
147145
RUNTIME.warn(errMsg);
148-
logger.warn("[latency monitor] fail to acquire refresh table meta lock, tableName: {}", tableName);
149146
throw new ObTableTryLockTimeoutException(errMsg);
150147
}
151-
logger.warn("[latency monitor] success to acquire refresh table meta lock, tableName: {}", tableName);
148+
logger.debug("success to acquire refresh table meta lock, tableName: {}", tableName);
152149
tableEntry = locations.get(tableName);
153150
if (tableEntry != null) {
154151
long current = System.currentTimeMillis();
@@ -192,7 +189,6 @@ public TableEntry refreshMeta(String tableName, ServerRoster serverRoster,
192189
}
193190
} // end while
194191
} finally {
195-
logger.warn("[latency monitor] unlock refresh table meta lock, tableName: {}, execute time: {}", tableName, System.currentTimeMillis() - start);
196192
if (acquired) {
197193
lock.unlock();
198194
}
@@ -214,7 +210,6 @@ private TableEntry refreshTableEntry(TableEntry tableEntry, String tableName,
214210
TableEntryKey tableEntryKey = new TableEntryKey(tableClient.getClusterName(),
215211
tableClient.getTenantName(), tableClient.getDatabase(), tableName);
216212
try {
217-
long start = System.currentTimeMillis();
218213
// tableEntry will point to a new object, the old tableEntry will be gc by jvm
219214
tableEntry = loadTableEntryWithPriority(serverRoster, //
220215
tableEntry, //
@@ -223,7 +218,6 @@ private TableEntry refreshTableEntry(TableEntry tableEntry, String tableName,
223218
tableClient.getTableEntryAcquireSocketTimeout(),//
224219
tableClient.getServerAddressPriorityTimeout(), sysUA, !tableClient
225220
.getServerCapacity().isSupportDistributedExecute());
226-
logger.warn("[latency monitor] finish loadTableEntryWithPriority in refresh meta, execute time: {}", System.currentTimeMillis() - start);
227221
if (tableEntry.isPartitionTable()) {
228222
switch (tableClient.getRunningMode()) {
229223
case HBASE:
@@ -306,8 +300,6 @@ public TableEntry refreshPartitionLocation(TableEntry tableEntry, String tableNa
306300
}
307301
Lock lock = locationInfo.refreshLock;
308302
boolean acquired = false;
309-
logger.warn("[latency monitor] try to acquire refresh table location lock, tableName: {}", tableName);
310-
long start = System.currentTimeMillis();
311303
try {
312304
int tryTimes = 0;
313305
long startExecute = System.currentTimeMillis();
@@ -334,7 +326,7 @@ public TableEntry refreshPartitionLocation(TableEntry tableEntry, String tableNa
334326
RUNTIME.warn(errMsg);
335327
throw new ObTableTryLockTimeoutException(errMsg);
336328
}
337-
logger.warn("[latency monitor] success acquire refresh table location lock, tableName: {}", tableName);
329+
logger.debug("success acquire refresh table location lock, tableName: {}", tableName);
338330
locationInfo = tableEntry.getPartitionEntry().getPartitionInfo(tabletId);
339331
lastRefreshTime = locationInfo.getLastUpdateTime();
340332
currentTime = System.currentTimeMillis();
@@ -345,7 +337,6 @@ public TableEntry refreshPartitionLocation(TableEntry tableEntry, String tableNa
345337
tableName, lastRefreshTime, tableEntryRefreshInterval, currentTime);
346338
return tableEntry;
347339
}
348-
logger.warn("[latency monitor] do refresh table location lock, tableName: {}", tableName);
349340
tableEntry = loadTableEntryLocationWithPriority(serverRoster, tableEntryKey,
350341
tableEntry, tabletId, tableClient.getTableEntryAcquireConnectTimeout(),
351342
tableClient.getTableEntryAcquireSocketTimeout(),
@@ -363,12 +354,12 @@ public TableEntry refreshPartitionLocation(TableEntry tableEntry, String tableNa
363354
RUNTIME.error(
364355
"refresh partition location meet schema_version mismatched exception, tryTimes: {}", tryTimes, e);
365356
long schemaVersion = tableEntry.getSchemaVersion();
366-
logger.warn("[latency monitor] old schema_version is: {}", schemaVersion);
357+
logger.debug(
358+
"schema_version mismatch when refreshing tablet location, old schema_version is: {}", schemaVersion);
367359
tableEntry = locations.get(tableName);
368360
// sleep over waiting interval of refreshing meta to refresh meta
369361
long interval = System.currentTimeMillis()
370362
- tableEntry.getRefreshMetaTimeMills();
371-
logger.warn("[latency monitor] interval is: {}", interval);
372363
if (interval < 100) {
373364
Thread.sleep(100 - interval);
374365
}
@@ -402,10 +393,6 @@ public TableEntry refreshPartitionLocation(TableEntry tableEntry, String tableNa
402393
tableEntryRefreshContinuousFailureCount.set(0);
403394
return tableEntry;
404395
} finally {
405-
logger
406-
.warn(
407-
"[latency monitor] finish refresh table location lock, tableName: {}, execute time: {}",
408-
tableName, System.currentTimeMillis() - start);
409396
if (acquired) {
410397
lock.unlock();
411398
}
@@ -445,8 +432,6 @@ public TableEntry refreshTabletLocationBatch(TableEntry tableEntry, String table
445432
}
446433
Lock lock = getLocationBatchRefreshLock(tableName);
447434
boolean acquired = false;
448-
logger.warn("[latency monitor] try to acquire refresh tablet locations in batch lock, tableName: {}", tableName);
449-
long start = System.currentTimeMillis();
450435
try {
451436
int tryTimes = 0;
452437
long startExecute = System.currentTimeMillis();
@@ -468,13 +453,12 @@ public TableEntry refreshTabletLocationBatch(TableEntry tableEntry, String table
468453
acquired = lock.tryLock(tableEntryRefreshLockTimeout, TimeUnit.MILLISECONDS);
469454
}
470455
if (!acquired) {
471-
logger.warn("[latency monitor] fail to acquire refresh tablet locations in batch lock, tableName: {}", tableName);
472456
String errMsg = "try to lock locations refreshing in batch timeout " + " ,tableName:"
473457
+ tableName + " , timeout:" + tableEntryRefreshLockTimeout + ".";
474458
RUNTIME.warn(errMsg);
475459
throw new ObTableTryLockTimeoutException(errMsg);
476460
}
477-
logger.warn("[latency monitor] success to acquire refresh tablet locations in batch lock, tableName: {}", tableName);
461+
logger.debug("success to acquire refresh tablet locations in batch lock, tableName: {}", tableName);
478462
lastRefreshTime = tableEntry.getPartitionEntry().getLastRefreshAllTime();
479463
currentTime = System.currentTimeMillis();
480464
if (currentTime - lastRefreshTime < refreshBatchTabletInterval) {
@@ -484,7 +468,6 @@ public TableEntry refreshTabletLocationBatch(TableEntry tableEntry, String table
484468
tableName, lastRefreshTime, refreshBatchTabletInterval, currentTime);
485469
return tableEntry;
486470
}
487-
logger.warn("[latency monitor] do refresh tablet locations in batch lock, tableName: {}", tableName);
488471
tableEntry = loadTableEntryLocationInBatchWithPriority(serverRoster,
489472
tableEntryKey, tableEntry,
490473
tableClient.getTableEntryAcquireConnectTimeout(),
@@ -503,11 +486,11 @@ public TableEntry refreshTabletLocationBatch(TableEntry tableEntry, String table
503486
RUNTIME.error(
504487
"refresh location in batch meet schema_version mismatched exception, tryTimes: {}", tryTimes, e);
505488
long schemaVersion = tableEntry.getSchemaVersion();
506-
logger.warn("[latency monitor] old schema_version is: {}", schemaVersion);
489+
logger.debug(
490+
"schema_version mismatch when refreshing tablet locations in batch, old schema_version is: {}", schemaVersion);
507491
tableEntry = locations.get(tableName);
508492
// sleep over waiting interval of refreshing meta to refresh meta
509493
long interval = System.currentTimeMillis() - tableEntry.getRefreshMetaTimeMills();
510-
logger.warn("[latency monitor] interval is: {}", interval);
511494
if (interval < 100) {
512495
Thread.sleep(100 - interval);
513496
}
@@ -541,7 +524,6 @@ public TableEntry refreshTabletLocationBatch(TableEntry tableEntry, String table
541524
tableEntryRefreshContinuousFailureCount.set(0);
542525
return tableEntry;
543526
} finally {
544-
logger.warn("[latency monitor] unlock refresh tablet locations in batch lock, tableName: {}, execute time: {}", tableName, System.currentTimeMillis() - start);
545527
if (acquired) {
546528
lock.unlock();
547529
}

0 commit comments

Comments
 (0)