25-3: Do not emit metering records with tags.ydb_size == 0 (#26121)

Author: CyberROFL

ydb/core/tx/schemeshard/schemeshard__serverless_storage_billing.cpp

@@ -76,6 +76,14 @@ struct TSchemeShard::TTxServerlessStorageBilling : public TTransactionBase<TSche
             return true;
         }
 
+        if (!spaceUsage.Tables.TotalSize) {
+            LOG_INFO_S(ctx, NKikimrServices::FLAT_TX_SCHEMESHARD, "TTxServerlessStorageBilling: nothing to bill"
+                       << ", schemeshardId: " << Self->SelfTabletId()
+                       << ", domainId: " << Self->ParentDomainId
+                       << ", next retry at: " << TimeToNextBill);
+            return true;
+        }
+
         NIceDb::TNiceDb db(txc.DB);
 
         if (!Self->ServerlessStorageLastBillTime) {

ydb/core/tx/schemeshard/ut_serverless/ut_serverless.cpp

@@ -253,7 +253,7 @@ Y_UNIT_TEST_SUITE(TSchemeShardServerLess) {
         waitMeteringMessage();
 
         {
-            TString meteringData = R"({"usage":{"start":1600452120,"quantity":59,"finish":1600452179,"type":"delta","unit":"byte*second"},"tags":{"ydb_size":13280},"labels":{"Category":"Table"},"id":"72057594046678944-3-1600452120-1600452179-13280","cloud_id":"CLOUD_ID_VAL","source_wt":1600452180,"source_id":"sless-docapi-ydb-storage","resource_id":"DATABASE_ID_VAL","schema":"ydb.serverless.v1","folder_id":"FOLDER_ID_VAL","version":"1.0.0"})";
+            TString meteringData = R"({"usage":{"start":1600452180,"quantity":59,"finish":1600452239,"type":"delta","unit":"byte*second"},"tags":{"ydb_size":13280},"labels":{"Category":"Table"},"id":"72057594046678944-3-1600452180-1600452239-13280","cloud_id":"CLOUD_ID_VAL","source_wt":1600452240,"source_id":"sless-docapi-ydb-storage","resource_id":"DATABASE_ID_VAL","schema":"ydb.serverless.v1","folder_id":"FOLDER_ID_VAL","version":"1.0.0"})";
             MeteringDataEqual(meteringMessages, meteringData);
         }
 
@@ -265,12 +265,9 @@ Y_UNIT_TEST_SUITE(TSchemeShardServerLess) {
         meteringMessages.clear();
         runtime.SetObserverFunc(grabMeteringMessage);
         runtime.AdvanceCurrentTime(TDuration::Minutes(1));
-        waitMeteringMessage();
+        runtime.SimulateSleep(TDuration::Minutes(1));
 
-        {
-            TString meteringData = R"({"usage":{"start":1600452180,"quantity":59,"finish":1600452239,"type":"delta","unit":"byte*second"},"tags":{"ydb_size":0},"labels":{"Category":"Table"},"id":"72057594046678944-3-1600452180-1600452239-0","cloud_id":"CLOUD_ID_VAL","source_wt":1600452240,"source_id":"sless-docapi-ydb-storage","resource_id":"DATABASE_ID_VAL","schema":"ydb.serverless.v1","folder_id":"FOLDER_ID_VAL","version":"1.0.0"})";
-            MeteringDataEqual(meteringMessages, meteringData);
-        }
+        UNIT_ASSERT(meteringMessages.empty());
     }
 
     Y_UNIT_TEST(StorageBillingLabels) {
@@ -334,6 +331,22 @@ Y_UNIT_TEST_SUITE(TSchemeShardServerLess) {
         }));
         env.TestWaitNotification(runtime, txId);
 
+        ui64 tenantSchemeShard = 0;
+        TestDescribeResult(DescribePath(runtime, "/MyRoot/ServerlessDB"), {
+            NLs::PathExist,
+            NLs::ExtractTenantSchemeshard(&tenantSchemeShard),
+        });
+
+        TestCreateTable(runtime, tenantSchemeShard, ++txId, "/MyRoot/ServerlessDB", R"(
+            Name: "Table"
+            Columns { Name: "key" Type: "Uint32" }
+            Columns { Name: "value" Type: "Utf8" }
+            KeyColumnNames: ["key"]
+        )");
+        env.TestWaitNotification(runtime, txId, tenantSchemeShard);
+
+        WriteRow(runtime, tenantSchemeShard, ++txId, "/MyRoot/ServerlessDB/Table", 0, 1, "v1");
+
         TBlockEvents<NMetering::TEvMetering::TEvWriteMeteringJson> block(runtime);
         runtime.WaitFor("metering", [&]{ return block.size() >= 1; });