Skip to content

Commit 87c7fd5

Browse files
UgnineSirdisUgnineSirdis
committed
Adopt the code to 24-4 version
1 parent eb115da commit 87c7fd5

File tree

18 files changed

+225
-179
lines changed

18 files changed

+225
-179
lines changed

‎ydb/core/cms/console/console_tenants_manager.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ class TSubDomainManip : public TActorBootstrapped<TSubDomainManip> {
541541

542542
request->Record.SetDatabaseName(TString(ExtractDomain(Subdomain.first)));
543543
request->Record.SetExecTimeoutPeriod(Max<ui64>());
544-
request->Record.SetPeerName(Tenant->PeerName);
544+
//request->Record.SetPeerName(Tenant->PeerName);
545545

546546
if (Tenant->UserToken.GetUserSID())
547547
request->Record.SetUserToken(Tenant->UserToken.SerializeAsString());
@@ -935,7 +935,7 @@ class TScaleRecommenderManip : public TActorBootstrapped<TScaleRecommenderManip>
935935

936936
Become(&TThis::StateResolveHive);
937937
ResolveHive(ctx);
938-
}
938+
}
939939

940940
void ResolveHive(const TActorContext &ctx) const {
941941
auto request = MakeHolder<NSchemeCache::TSchemeCacheNavigate>();
@@ -995,7 +995,7 @@ class TScaleRecommenderManip : public TActorBootstrapped<TScaleRecommenderManip>
995995
if (!domainInfo || !domainInfo->Params.HasHive()) {
996996
LOG_ERROR_S(ctx, NKikimrServices::CMS_TENANTS,
997997
"TScaleRecommenderManip resolved tenant "
998-
<< Tenant->Path
998+
<< Tenant->Path
999999
<< " that has no hive"
10001000
<< ", entry# " << entry.ToString());
10011001
Finish();
@@ -1026,7 +1026,7 @@ class TScaleRecommenderManip : public TActorBootstrapped<TScaleRecommenderManip>
10261026
default:
10271027
LOG_ERROR_S(ctx, NKikimrServices::CMS_TENANTS,
10281028
"TScaleRecommenderManip got unknown taget for target tracking policy for "
1029-
<< Tenant->Path
1029+
<< Tenant->Path
10301030
<< ", policy# " << p.target_tracking_policy().ShortDebugString());
10311031
Finish();
10321032
break;
@@ -1036,7 +1036,7 @@ class TScaleRecommenderManip : public TActorBootstrapped<TScaleRecommenderManip>
10361036
default:
10371037
LOG_ERROR_S(ctx, NKikimrServices::CMS_TENANTS,
10381038
"TScaleRecommenderManip got unknown scale policy for "
1039-
<< Tenant->Path
1039+
<< Tenant->Path
10401040
<< ", policies# " << Tenant->ScaleRecommenderPolicies->ShortDebugString());
10411041
Finish();
10421042
return;
@@ -1093,7 +1093,7 @@ class TScaleRecommenderManip : public TActorBootstrapped<TScaleRecommenderManip>
10931093
case NKikimrProto::UNKNOWN:
10941094
LOG_ERROR_S(ctx, NKikimrServices::CMS_TENANTS,
10951095
"TScaleRecommenderManip got error reply during configuring hive for "
1096-
<< Tenant->Path
1096+
<< Tenant->Path
10971097
<< ", reply# " << ev->Get()->Record.ShortDebugString());
10981098
Finish();
10991099
break;

‎ydb/core/mon/async_http_mon.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,12 +347,8 @@ class THttpMonLegacyActorRequest : public TActorBootstrapped<THttpMonLegacyActor
347347
<< " " << request->URL);
348348
}
349349
TString serializedToken;
350-
if (result) {
351-
AuditCtx.AddAuditLogParts(result->AuditLogParts);
352-
if (result->UserToken) {
353-
AuditCtx.SetSubjectType(result->UserToken->GetSubjectType());
354-
serializedToken = result->UserToken->GetSerializedToken();
355-
}
350+
if (result && result->UserToken) {
351+
serializedToken = result->UserToken->GetSerializedToken();
356352
}
357353
AuditCtx.LogOnReceived();
358354
Send(ActorMonPage->TargetActorId, new NMon::TEvHttpInfo(
@@ -380,6 +376,10 @@ class THttpMonLegacyActorRequest : public TActorBootstrapped<THttpMonLegacyActor
380376

381377
void Handle(NKikimr::NGRpcService::TEvRequestAuthAndCheckResult::TPtr& ev) {
382378
const NKikimr::NGRpcService::TEvRequestAuthAndCheckResult& result(*ev->Get());
379+
AuditCtx.AddAuditLogParts(result.AuditLogParts);
380+
if (result.UserToken) {
381+
AuditCtx.SetSubjectType(result.UserToken->GetSubjectType());
382+
}
383383
if (result.Status != Ydb::StatusIds::SUCCESS) {
384384
return ReplyErrorAndPassAway(result);
385385
}

‎ydb/tests/functional/audit/canondata/result.json‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@
2727
"uri": "file://test_canonical_records.test_create_drop_and_alter_table/audit_log.2.json"
2828
}
2929
],
30-
"test_canonical_records.test_dml": {
31-
"uri": "file://test_canonical_records.test_dml/audit_log.json"
32-
},
3330
"test_canonical_records.test_dml_through_http": {
3431
"uri": "file://test_canonical_records.test_dml_through_http/audit_log.json"
3532
},
@@ -39,9 +36,6 @@
3936
"test_canonical_records.test_dstool_evict_vdisk_grpc": {
4037
"uri": "file://test_canonical_records.test_dstool_evict_vdisk_grpc/audit_log.json"
4138
},
42-
"test_canonical_records.test_execute_minikql": {
43-
"uri": "file://test_canonical_records.test_execute_minikql/audit_log.json"
44-
},
4539
"test_canonical_records.test_kill_tablet_using_developer_ui": {
4640
"uri": "file://test_canonical_records.test_kill_tablet_using_developer_ui/audit_log.json"
4741
},

‎ydb/tests/functional/audit/canondata/test_canonical_records.test_create_drop_and_alter_database/audit_log.1.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
1-
{"component": "schemeshard", "database": "/Root", "detailed_status": "StatusAccepted", "operation": "CREATE DATABASE", "paths": "[/Root/Database]", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin", "tx_id": "<canonized_tx_id>"}
2-
{"component": "schemeshard", "database": "/Root", "detailed_status": "StatusAccepted", "operation": "ALTER DATABASE", "paths": "[/Root/Database]", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin", "tx_id": "<canonized_tx_id>"}
3-
{"acl_add": "[+U:root@builtin, +(SR|DS):all-users@well-known, +(SR|DS):root@builtin]", "component": "schemeshard", "database": "/Root/Database", "detailed_status": "StatusAccepted", "new_owner": "metadata@system", "operation": "CREATE RESOURCE POOL", "paths": "[.metadata/workload_manager/pools/default]", "remote_address": "{none}", "sanitized_token": "{none}", "status": "SUCCESS", "subject": "metadata@system", "tx_id": "<canonized_tx_id>"}
4-
{"acl_add": "[+U:root@builtin, +(SR|DS):all-users@well-known, +(SR|DS):root@builtin]", "component": "schemeshard", "database": "/Root/Database", "detailed_status": "StatusAlreadyExists", "new_owner": "metadata@system", "operation": "CREATE RESOURCE POOL", "paths": "[default]", "reason": "Check failed: path: '/Root/Database/.metadata/workload_manager/pools/default', error: path exist, request accepts it (id: [OwnerId: <canonized_owner_id>, LocalPathId: <canonized_local_path_id>], type: EPathTypeResourcePool, state: EPathStateNoChanges)", "remote_address": "{none}", "sanitized_token": "{none}", "status": "SUCCESS", "subject": "metadata@system", "tx_id": "<canonized_tx_id>"}
1+
{"component": "schemeshard", "database": "/Root", "detailed_status": "StatusAccepted", "operation": "CREATE DATABASE", "paths": "[/Root/Database]", "remote_address": "{none}", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin", "tx_id": "<canonized_tx_id>"}
2+
{"component": "schemeshard", "database": "/Root", "detailed_status": "StatusAccepted", "operation": "ALTER DATABASE", "paths": "[/Root/Database]", "remote_address": "{none}", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin", "tx_id": "<canonized_tx_id>"}

‎ydb/tests/functional/audit/canondata/test_canonical_records.test_create_drop_and_alter_database/audit_log.3.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
{"component": "console", "database": "/Root/Database", "operation": "BEGIN REMOVE DATABASE", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin"}
2-
{"component": "console", "database": "/Root/Database", "operation": "END REMOVE DATABASE", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin"}

‎ydb/tests/functional/audit/canondata/test_canonical_records.test_create_drop_and_alter_database/audit_log.4.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"component": "schemeshard", "database": "/Root", "detailed_status": "StatusAccepted", "operation": "DROP DATABASE", "paths": "[/Root/Database]", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin", "tx_id": "<canonized_tx_id>"}
1+
{"component": "schemeshard", "database": "/Root", "detailed_status": "StatusAccepted", "operation": "DROP DATABASE", "paths": "[/Root/Database]", "remote_address": "{none}", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin", "tx_id": "<canonized_tx_id>"}

‎ydb/tests/functional/audit/canondata/test_canonical_records.test_create_drop_and_alter_database/audit_log.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +0,0 @@
1-
{"component": "console", "database": "/Root/Database", "operation": "BEGIN INIT DATABASE CONFIG", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin"}
2-
{"component": "console", "database": "/Root/Database", "operation": "END INIT DATABASE CONFIG", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin"}

‎ydb/tests/functional/audit/canondata/test_canonical_records.test_dml/audit_log.json‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎ydb/tests/functional/audit/canondata/test_canonical_records.test_execute_minikql/audit_log.json‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎ydb/tests/functional/audit/canondata/test_canonical_records.test_topic/audit_log.json‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
{"component": "grpc-proxy", "database": "/Root", "grpc_method": "Ydb.Topic.V1.TopicService/TopicService/CreateTopic", "operation": "CreateTopicRequest", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "start_time": "<canonized_start_time>", "status": "IN-PROCESS", "subject": "root@builtin"}
22
{"component": "schemeshard", "database": "/Root", "detailed_status": "StatusAccepted", "operation": "CREATE PERSISTENT QUEUE", "paths": "[/Root/test_topic]", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin", "tx_id": "<canonized_tx_id>"}
33
{"component": "grpc-proxy", "database": "/Root", "detailed_status": "SUCCESS", "end_time": "<canonized_end_time>", "grpc_method": "Ydb.Topic.V1.TopicService/TopicService/CreateTopic", "operation": "CreateTopicRequest", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "start_time": "<canonized_start_time>", "status": "SUCCESS", "subject": "root@builtin"}
4-
{"component": "grpc-proxy", "database": "/Root", "grpc_method": "Ydb.Topic.V1.TopicService/TopicService/AlterTopic", "operation": "AlterTopicRequest", "remote_address": "<canonized_remote_address>", "sanitized_token": "othe****ltin (27F910A9)", "start_time": "<canonized_start_time>", "status": "IN-PROCESS", "subject": "other-user@builtin"}
5-
{"component": "grpc-proxy", "database": "/Root", "detailed_status": "SCHEME_ERROR", "end_time": "<canonized_end_time>", "grpc_method": "Ydb.Topic.V1.TopicService/TopicService/AlterTopic", "operation": "AlterTopicRequest", "remote_address": "<canonized_remote_address>", "sanitized_token": "othe****ltin (27F910A9)", "start_time": "<canonized_start_time>", "status": "ERROR", "subject": "other-user@builtin"}
6-
{"component": "grpc-proxy", "database": "/Root", "grpc_method": "Ydb.Topic.V1.TopicService/TopicService/AlterTopic", "operation": "AlterTopicRequest", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "start_time": "<canonized_start_time>", "status": "IN-PROCESS", "subject": "root@builtin"}
7-
{"component": "schemeshard", "database": "/Root", "detailed_status": "StatusAccepted", "operation": "ALTER PERSISTENT QUEUE", "paths": "[/Root/test_topic]", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin", "tx_id": "<canonized_tx_id>"}
8-
{"component": "grpc-proxy", "database": "/Root", "detailed_status": "SUCCESS", "end_time": "<canonized_end_time>", "grpc_method": "Ydb.Topic.V1.TopicService/TopicService/AlterTopic", "operation": "AlterTopicRequest", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "start_time": "<canonized_start_time>", "status": "SUCCESS", "subject": "root@builtin"}
9-
{"component": "grpc-proxy", "database": "/Root", "grpc_method": "Ydb.Topic.V1.TopicService/TopicService/AlterTopic", "operation": "AlterTopicRequest", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "start_time": "<canonized_start_time>", "status": "IN-PROCESS", "subject": "root@builtin"}
10-
{"component": "schemeshard", "database": "/Root", "detailed_status": "StatusAccepted", "operation": "ALTER PERSISTENT QUEUE", "paths": "[/Root/test_topic]", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "status": "SUCCESS", "subject": "root@builtin", "tx_id": "<canonized_tx_id>"}
11-
{"component": "grpc-proxy", "database": "/Root", "detailed_status": "SUCCESS", "end_time": "<canonized_end_time>", "grpc_method": "Ydb.Topic.V1.TopicService/TopicService/AlterTopic", "operation": "AlterTopicRequest", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "start_time": "<canonized_start_time>", "status": "SUCCESS", "subject": "root@builtin"}
124
{"component": "grpc-proxy", "database": "/Root", "grpc_method": "Ydb.Topic.V1.TopicService/TopicService/StreamWrite", "operation": "FromClient", "remote_address": "<canonized_remote_address>", "sanitized_token": "**** (B6C6F477)", "start_time": "<canonized_start_time>", "status": "IN-PROCESS", "subject": "root@builtin"}
135
{"component": "schemeshard", "database": "/Root", "detailed_status": "StatusAccepted", "operation": "CREATE TABLE", "paths": "[/Root/.metadata/initialization/migrations]", "remote_address": "<canonized_remote_address>", "sanitized_token": "{none}", "status": "SUCCESS", "subject": "metadata@system", "tx_id": "<canonized_tx_id>"}
146
{"acl_add": "[+(SR|RA):all-users@well-known, +(DS):all-users@well-known]", "acl_remove": "[-()::-]", "component": "schemeshard", "database": "/Root", "detailed_status": "StatusSuccess", "operation": "MODIFY ACL", "paths": "[//Root/.metadata/initialization/migrations]", "remote_address": "<canonized_remote_address>", "sanitized_token": "{none}", "status": "SUCCESS", "subject": "metadata@system", "tx_id": "<canonized_tx_id>"}

0 commit comments

Comments
 (0)