Fix INFO all/default/everything returning empty response (#1645)

vazois · Copilot · vazois · commit 985c12994657 · 2026-03-27T14:41:48.000-07:00
* Fix INFO all/default/everything returning empty response Implement support for INFO all, default, and everything options: - all: returns all DefaultInfo sections excluding module-generated ones - default: returns the default set of sections (same as no-arg INFO) - everything: returns all DefaultInfo sections including modules Added pre-declared HashSet collections (AllInfoSet, EverythingInfoSet) in GarnetInfoMetrics.cs derived from DefaultInfo to support these options. Updated InfoCommand.cs to use UnionWith with the new HashSets instead of silently skipping the ALL keyword. Added tests for all three options, verifying correct section inclusion/exclusion. Fixes #1643 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * make everything option use DefaultInfo * Add null/empty guard in GetSectionHeaders test helper Adds explicit asserts before splitting INFO output so test failures surface a clear message instead of a NullReferenceException. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> * wip; restructuring cluster tests to reduce CI duration * separate dispose from close and configure socket to allow rapid connect * ensure socket is disposed succesfully * fix failing test * update global.json --------- Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.103",
+    "version": "10.0.201",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }
diff --git a/libs/server/Lua/LuaTimeoutManager.cs b/libs/server/Lua/LuaTimeoutManager.cs
@@ -263,7 +263,7 @@ internal Registration RegisterForTimeout(SessionScriptCache cache)
                 goto tryAgain;
             }
 
-        // Other threads might update registrations, so check that before returning
+            // Other threads might update registrations, so check that before returning
         checkUnmodified:
             if ((updatedRegistrations = Interlocked.CompareExchange(ref registrations, curRegistrations, curRegistrations)) != curRegistrations)
             {
diff --git a/libs/server/Metrics/Info/GarnetInfoMetrics.cs b/libs/server/Metrics/Info/GarnetInfoMetrics.cs
@@ -23,6 +23,11 @@ class GarnetInfoMetrics
                 _ => true
             })];
 
+        /// <summary>
+        /// All info sections excluding module-generated ones.
+        /// </summary>
+        public static readonly HashSet<InfoMetricsType> AllInfoSet = [.. DefaultInfo.Where(e => e != InfoMetricsType.MODULES)];
+
         MetricsItem[] serverInfo = null;
         MetricsItem[] memoryInfo = null;
         MetricsItem[] clusterInfo = null;
diff --git a/libs/server/Metrics/Info/InfoCommand.cs b/libs/server/Metrics/Info/InfoCommand.cs
@@ -28,17 +28,20 @@ private bool NetworkINFO()
                         reset = true;
                     else if (sbSection.EqualsUpperCaseSpanIgnoringCase("HELP"u8))
                         help = true;
-                    else if (!sbSection.EqualsUpperCaseSpanIgnoringCase("ALL"u8))
+                    else if (sbSection.EqualsUpperCaseSpanIgnoringCase("ALL"u8))
+                        sections.UnionWith(GarnetInfoMetrics.AllInfoSet);
+                    else if (sbSection.EqualsUpperCaseSpanIgnoringCase("DEFAULT"u8))
+                        sections.UnionWith(GarnetInfoMetrics.DefaultInfo);
+                    else if (sbSection.EqualsUpperCaseSpanIgnoringCase("EVERYTHING"u8))
+                        sections.UnionWith(GarnetInfoMetrics.DefaultInfo);
+                    else if (parseState.TryGetInfoMetricsType(i, out var sectionType))
                     {
-                        if (parseState.TryGetInfoMetricsType(i, out var sectionType))
-                        {
-                            sections.Add(sectionType);
-                        }
-                        else
-                        {
-                            invalid = true;
-                            invalidSection = parseState.GetString(i);
-                        }
+                        sections.Add(sectionType);
+                    }
+                    else
+                    {
+                        invalid = true;
+                        invalidSection = parseState.GetString(i);
                     }
                 }
             }
diff --git a/libs/server/Metrics/Info/InfoHelp.cs b/libs/server/Metrics/Info/InfoHelp.cs
@@ -10,6 +10,8 @@ class InfoHelp
     {
         internal const string HELP = "HELP";
         internal const string ALL = "ALL";
+        internal const string DEFAULT = "DEFAULT";
+        internal const string EVERYTHING = "EVERYTHING";
         internal const string RESET = "RESET";
 
         public static List<string> GetInfoTypeHelpMessage()
@@ -30,7 +32,9 @@ public static List<string> GetInfoTypeHelpMessage()
                 $"{nameof(InfoMetricsType.KEYSPACE)}: Database related statistics.",
                 $"{nameof(InfoMetricsType.MODULES)}: Information related to loaded modules.",
                 $"{nameof(InfoMetricsType.HLOGSCAN)}: Distribution of records in main store's hybrid log in-memory portion.",
-                $"{nameof(ALL)}: Return all informational sections.",
+                $"{nameof(ALL)}: Return all informational sections (excluding module generated ones).",
+                $"{nameof(DEFAULT)}: Return the default set of informational sections.",
+                $"{nameof(EVERYTHING)}: Return all informational sections including module generated ones.",
                 $"{nameof(HELP)}: Print this help message.",
                 $"{nameof(RESET)}: Reset stats.",
                 "\r\n",
diff --git a/libs/storage/Tsavorite/cs/src/core/Allocator/AllocatorScan.cs b/libs/storage/Tsavorite/cs/src/core/Allocator/AllocatorScan.cs
@@ -268,7 +268,7 @@ private protected bool ScanLookup<TInput, TOutput, TScanFunctions, TScanIterator
             if (numPending > 0)
                 _ = bContext.CompletePending(wait: true);
 
-            IterationComplete:
+        IterationComplete:
             if (resetCursor)
                 cursor = 0;
             scanFunctions.OnStop(false, scanCursorState.acceptedCount);
diff --git a/libs/storage/Tsavorite/cs/src/core/Index/Tsavorite/Implementation/ContinuePending.cs b/libs/storage/Tsavorite/cs/src/core/Index/Tsavorite/Implementation/ContinuePending.cs
@@ -246,7 +246,7 @@ internal OperationStatus ContinuePendingRMW<TInput, TOutput, TContext, TSessionF
                     EphemeralXUnlock<TInput, TOutput, TContext, TSessionFunctionsWrapper>(sessionFunctions, ref stackCtx);
                 }
 
-            // Must do this *after* Unlocking.
+                // Must do this *after* Unlocking.
             CheckRetry:
                 if (!HandleImmediateRetryStatus(status, sessionFunctions, ref pendingContext))
                     return status;
diff --git a/playground/Bitmap/BitOp.cs b/playground/Bitmap/BitOp.cs
@@ -360,7 +360,7 @@ private static void __bitop_simdX128_and(byte* dstBitmap, long dstLen, byte* src
             #endregion
 
             #region fillDstTail
-            fillTail:
+        fillTail:
             if (dstLen > srcLen)
             {
                 batchSize = 8 * 4;
@@ -530,7 +530,7 @@ private static void __bitop_simdX128_and_long(byte* dstBitmap, long dstLen, byte
             #endregion
 
             #region fillDstTail
-            fillTail:
+        fillTail:
             if (dstLen > srcLen)
             {
                 batchSize = 8 * 4;
@@ -729,7 +729,7 @@ private static void __bitop_simdX256_and(byte* dstBitmap, long dstLen, byte* src
             #endregion
 
             #region fillDstTail
-            fillTail:
+        fillTail:
             if (dstLen > srcLen)
             {
                 batchSize = 8 * 4;
@@ -828,7 +828,7 @@ private static void __bitop_multikey_scalar_and(byte* dstPtr, int dstLen, byte**
                 *(long*)dstCurr = d00;
                 dstCurr += batchSize;
             }
-        #endregion
+            #endregion
 
         fillTail:
             #region scalar_1x1    
@@ -1046,7 +1046,7 @@ private static void __bitop_multikey_simdX128_and(byte* dstPtr, int dstLen, byte
                 *(long*)dstCurr = d00;
                 dstCurr += batchSize;
             }
-        #endregion
+            #endregion
 
         fillTail:
             #region scalar_1x1    
@@ -1266,7 +1266,7 @@ private static void __bitop_multikey_simdX256_and(byte* dstPtr, int dstLen, byte
                 *(long*)dstCurr = d00;
                 dstCurr += batchSize;
             }
-        #endregion
+            #endregion
 
         fillTail:
             #region scalar_1x1    
diff --git a/test/Garnet.test.cluster/ClusterNegativeTests.cs b/test/Garnet.test.cluster/ClusterNegativeTests.cs
@@ -312,6 +312,8 @@ public void ClusterReplicaAttachIntenseWrite(CancellationToken cancellationToken
             context.clusterTestUtils.SetConfigEpoch(primaryIndex, primaryIndex + 1, logger: context.logger);
             context.clusterTestUtils.SetConfigEpoch(replicaIndex, replicaIndex + 1, logger: context.logger);
             context.clusterTestUtils.Meet(primaryIndex, replicaIndex, logger: context.logger);
+            context.clusterTestUtils.WaitUntilNodeIsKnown(primaryIndex, replicaIndex, logger: context.logger);
+            context.clusterTestUtils.WaitUntilNodeIsKnown(replicaIndex, primaryIndex, logger: context.logger);
 
             var keyLength = 32;
             var kvpairCount = 32;
diff --git a/test/Garnet.test.cluster/ClusterTestContext.cs b/test/Garnet.test.cluster/ClusterTestContext.cs
@@ -139,7 +139,7 @@ public void TearDown()
             waiter?.Dispose();
             clusterTestUtils?.Dispose();
 
-            var timeoutSeconds = 30;
+            var timeoutSeconds = 60;
             string failureReason = null;
 
             // Phase 1: Dispose cluster nodes (may timeout if handlers are stuck)
diff --git a/test/Garnet.test/RespInfoTests.cs b/test/Garnet.test/RespInfoTests.cs
@@ -75,6 +75,86 @@ public void ResetStatsTest()
             ClassicAssert.AreEqual("total_found:1", totalFound, "Expected total_found to be one after sending one successful request");
         }
 
+        [Test]
+        [TestCase("ALL")]
+        [TestCase("DEFAULT")]
+        [TestCase("EVERYTHING")]
+        public void InfoSectionOptionsTest(string option)
+        {
+            using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
+            var db = redis.GetDatabase(0);
+
+            var infoResult = db.Execute("INFO", option).ToString();
+            ClassicAssert.IsNotNull(infoResult);
+            ClassicAssert.IsNotEmpty(infoResult);
+
+            // All options should include these core sections
+            ClassicAssert.IsTrue(infoResult.Contains("# Server"), $"INFO {option} should contain Server section");
+            ClassicAssert.IsTrue(infoResult.Contains("# Memory"), $"INFO {option} should contain Memory section");
+            ClassicAssert.IsTrue(infoResult.Contains("# Stats"), $"INFO {option} should contain Stats section");
+            ClassicAssert.IsTrue(infoResult.Contains("# Clients"), $"INFO {option} should contain Clients section");
+            ClassicAssert.IsTrue(infoResult.Contains("# Keyspace"), $"INFO {option} should contain Keyspace section");
+
+            // ALL excludes Modules section; DEFAULT and EVERYTHING include it
+            if (option == "ALL")
+            {
+                ClassicAssert.IsFalse(infoResult.Contains("# Modules"), "INFO ALL should not contain Modules section");
+            }
+            else
+            {
+                ClassicAssert.IsTrue(infoResult.Contains("# Modules"), $"INFO {option} should contain Modules section");
+            }
+
+            // All three options are based on DefaultInfo which excludes expensive sections
+            ClassicAssert.IsFalse(infoResult.Contains("MainStoreHashTableDistribution"), $"INFO {option} should not contain StoreHashTable section");
+            ClassicAssert.IsFalse(infoResult.Contains("MainStoreDeletedRecordRevivification"), $"INFO {option} should not contain StoreReviv section");
+        }
+
+        [Test]
+        public void InfoDefaultMatchesNoArgsTest()
+        {
+            using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
+            var db = redis.GetDatabase(0);
+
+            var infoNoArgs = db.Execute("INFO").ToString();
+            var infoDefault = db.Execute("INFO", "DEFAULT").ToString();
+
+            // Both should return the same set of section headers
+            var noArgsSections = GetSectionHeaders(infoNoArgs);
+            var defaultSections = GetSectionHeaders(infoDefault);
+
+            CollectionAssert.AreEquivalent(noArgsSections, defaultSections,
+                "INFO (no args) and INFO DEFAULT should return the same sections");
+        }
+
+        [Test]
+        public void InfoAllWithModulesEqualsEverythingTest()
+        {
+            using var redis = ConnectionMultiplexer.Connect(TestUtils.GetConfig());
+            var db = redis.GetDatabase(0);
+
+            var infoEverything = db.Execute("INFO", "EVERYTHING").ToString();
+            var infoAllModules = db.Execute("INFO", "ALL", "MODULES").ToString();
+
+            var everythingSections = GetSectionHeaders(infoEverything);
+            var allModulesSections = GetSectionHeaders(infoAllModules);
+
+            CollectionAssert.AreEquivalent(everythingSections, allModulesSections,
+                "INFO EVERYTHING and INFO ALL MODULES should return the same sections");
+        }
+
+        private static List<string> GetSectionHeaders(string infoOutput)
+        {
+            ClassicAssert.IsNotNull(infoOutput, "INFO output should not be null");
+            ClassicAssert.IsNotEmpty(infoOutput, "INFO output should not be empty");
+
+            return infoOutput.Split("\r\n")
+                .Where(line => line.StartsWith("# "))
+                .Select(line => line.TrimStart('#', ' '))
+                .OrderBy(s => s)
+                .ToList();
+        }
+
         [Test]
         public async Task InfoHlogScanTest()
         {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "10.0.103",`
	`3`	`+ "version": "10.0.201",`
`4`	`4`	`"rollForward": "latestMajor",`
`5`	`5`	`"allowPrerelease": false`
`6`	`6`	`}`
Original file line number	Diff line number	Diff line change
`@@ -263,7 +263,7 @@ internal Registration RegisterForTimeout(SessionScriptCache cache)`
`263`	`263`	`goto tryAgain;`
`264`	`264`	`}`
`265`	`265`
`266`		`- // Other threads might update registrations, so check that before returning`
	`266`	`+ // Other threads might update registrations, so check that before returning`
`267`	`267`	`checkUnmodified:`
`268`	`268`	`if ((updatedRegistrations = Interlocked.CompareExchange(ref registrations, curRegistrations, curRegistrations)) != curRegistrations)`
`269`	`269`	`{`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ internal OperationStatus ContinuePendingRMW<TInput, TOutput, TContext, TSessionF`
`246`	`246`	`EphemeralXUnlock<TInput, TOutput, TContext, TSessionFunctionsWrapper>(sessionFunctions, ref stackCtx);`
`247`	`247`	`}`
`248`	`248`
`249`		`- // Must do this after Unlocking.`
	`249`	`+ // Must do this after Unlocking.`
`250`	`250`	`CheckRetry:`
`251`	`251`	`if (!HandleImmediateRetryStatus(status, sessionFunctions, ref pendingContext))`
`252`	`252`	`return status;`