Skip to content

Commit 48bd352

Browse files
authored
Delete audit implementation (#16899)
1 parent 7c7b2a6 commit 48bd352

File tree

4 files changed

+8
-519
lines changed

4 files changed

+8
-519
lines changed

integration-test/src/test/java/org/apache/iotdb/db/it/audit/IoTDBAuditLogBasicIT.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import org.junit.After;
3333
import org.junit.Assert;
3434
import org.junit.Before;
35+
import org.junit.Ignore;
3536
import org.junit.Test;
3637
import org.junit.experimental.categories.Category;
3738
import org.junit.runner.RunWith;
@@ -52,6 +53,7 @@
5253
* This test class ensures the audit log behave exactly the same as we expected, including the
5354
* number, sequence and content of the audit logs.
5455
*/
56+
@Ignore
5557
@RunWith(IoTDBTestRunner.class)
5658
@Category({LocalStandaloneIT.class})
5759
public class IoTDBAuditLogBasicIT {

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/audit/CNAuditLogger.java

Lines changed: 1 addition & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,16 @@
1919

2020
package org.apache.iotdb.confignode.audit;
2121

22-
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
23-
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
24-
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
25-
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
2622
import org.apache.iotdb.commons.audit.AbstractAuditLogger;
2723
import org.apache.iotdb.commons.audit.IAuditEntity;
28-
import org.apache.iotdb.confignode.client.async.AsyncDataNodeHeartbeatClientPool;
29-
import org.apache.iotdb.confignode.client.async.handlers.audit.DataNodeWriteAuditLogHandler;
3024
import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
3125
import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
3226
import org.apache.iotdb.confignode.manager.ConfigManager;
3327
import org.apache.iotdb.confignode.manager.IManager;
34-
import org.apache.iotdb.mpp.rpc.thrift.TAuditLogReq;
3528

3629
import org.slf4j.Logger;
3730
import org.slf4j.LoggerFactory;
3831

39-
import java.util.List;
4032
import java.util.function.Supplier;
4133

4234
public class CNAuditLogger extends AbstractAuditLogger {
@@ -50,45 +42,5 @@ public CNAuditLogger(ConfigManager configManager) {
5042
}
5143

5244
@Override
53-
public void log(IAuditEntity auditLogFields, Supplier<String> log) {
54-
if (!IS_AUDIT_LOG_ENABLED) {
55-
return;
56-
}
57-
if (noNeedInsertAuditLog(auditLogFields)) {
58-
return;
59-
}
60-
// find database "__audit"'s data_region
61-
List<TRegionReplicaSet> auditReplicaSets =
62-
configManager
63-
.getPartitionManager()
64-
.getAllReplicaSets("root.__audit", TConsensusGroupType.DataRegion);
65-
if (auditReplicaSets.isEmpty()) {
66-
logger.warn("Database {} does not exist.", "root.__audit");
67-
return;
68-
}
69-
TConsensusGroupId regionId = auditReplicaSets.get(0).getRegionId();
70-
// use ConfigManager.getLoadManager().getLoadCache().getRegionLeaderMap() to get regionLeaderId
71-
TDataNodeLocation regionLeader = configManager.getRegionLeaderLocation(regionId);
72-
TAuditLogReq req =
73-
new TAuditLogReq(
74-
auditLogFields.getUsername(),
75-
auditLogFields.getUserId(),
76-
auditLogFields.getCliHostname(),
77-
auditLogFields.getAuditEventType().toString(),
78-
auditLogFields.getAuditLogOperation().toString(),
79-
auditLogFields.getPrivilegeTypeString(),
80-
auditLogFields.getResult(),
81-
auditLogFields.getDatabase(),
82-
auditLogFields.getSqlString(),
83-
log.get(),
84-
CONF.getConfigNodeId());
85-
// refer the implementation of HeartbeatService.pingRegisteredDataNode(). By appending a new
86-
// writeAudtiLog() interface in AsyncDataNodeHeartbeatClientPool, the main thread is not
87-
// required to wait until the write audit log request to be complete.
88-
AsyncDataNodeHeartbeatClientPool.getInstance()
89-
.writeAuditLog(
90-
regionLeader.getInternalEndPoint(),
91-
req,
92-
new DataNodeWriteAuditLogHandler(regionLeader.getDataNodeId()));
93-
}
45+
public void log(IAuditEntity auditLogFields, Supplier<String> log) {}
9446
}

0 commit comments

Comments
 (0)