Fix system stats with MongoDB >= 4.4 (#11357)

Graylog2 · Sep 28, 2021 · 28b3287 · 28b3287
1 parent 96008c1
commit 28b3287
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog2/system/stats/mongo/DatabaseStats.java b/graylog2-server/src/main/java/org/graylog2/system/stats/mongo/DatabaseStats.java
@@ -49,7 +49,8 @@ public abstract class DatabaseStats {
     public abstract long storageSize();
 
     @JsonProperty
-    public abstract long numExtents();
+    @Nullable
+    public abstract Long numExtents();
 
     @JsonProperty
     public abstract long indexes();
@@ -79,7 +80,7 @@ public static DatabaseStats create(String db,
                                        double avgObjSize,
                                        long dataSize,
                                        long storageSize,
-                                       long numExtents,
+                                       @Nullable Long numExtents,
                                        long indexes,
                                        long indexSize,
                                        @Nullable Long fileSize,

diff --git a/graylog2-server/src/main/java/org/graylog2/system/stats/mongo/MongoProbe.java b/graylog2-server/src/main/java/org/graylog2/system/stats/mongo/MongoProbe.java
@@ -173,7 +173,7 @@ public MongoStats mongoStats() {
                     dbStatsResult.getDouble("avgObjSize"),
                     dbStatsResult.getLong("dataSize"),
                     dbStatsResult.getLong("storageSize"),
-                    dbStatsResult.getLong("numExtents"),
+                    dbStatsResult.containsField("numExtents") ? dbStatsResult.getLong("numExtents") : null,
                     dbStatsResult.getLong("indexes"),
                     dbStatsResult.getLong("indexSize"),
                     dbStatsResult.containsField("fileSize") ? dbStatsResult.getLong("fileSize") : null,