IGNITE-14266 Added "page free space" column to pages lists system vie…

…ws - Fixes apache#10631. Signed-off-by: Aleksey Plekhanov <[email protected]>
vitavin · Apr 10, 2023 · aa57c09 · aa57c09
1 parent d0d3ead
commit aa57c09
Show file tree

Hide file tree

Showing 9 changed files with 59 additions and 2 deletions.
diff --git a/docs/_docs/monitoring-metrics/system-views.adoc b/docs/_docs/monitoring-metrics/system-views.adoc
@@ -696,6 +696,7 @@ and also helps to detect skews in page lists utilization.
 |BUCKET_SIZE | long  |  Count of pages in the bucket
 |STRIPES_COUNT |   int| Count of stripes used by this bucket. Stripes are used to avoid contention.
 |CACHED_PAGES_COUNT |  int| Count of pages in an on-heap page list cache for this bucket.
+|PAGE_FREE_SPACE | int | Free space (in bytes) available to use for each page in this bucket.
 |===
 
 === DATA_REGION_PAGE_LISTS
@@ -708,6 +709,7 @@ and also helps to detect skews in page lists utilization.
 |BUCKET_SIZE | long  |  Count of pages in the bucket
 |STRIPES_COUNT |   int| Count of stripes used by this bucket. Stripes are used to avoid contention.
 |CACHED_PAGES_COUNT |  int| Count of pages in an on-heap page list cache for this bucket.
+|PAGE_FREE_SPACE | int | Free space (in bytes) available to use for each page in this bucket.
 |===
 
 == PARTITION_STATES

diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
@@ -1012,11 +1012,13 @@ public void testGetAllColumns() throws Exception {
                 "SYS.CACHE_GROUP_PAGE_LISTS.BUCKET_SIZE.null",
                 "SYS.CACHE_GROUP_PAGE_LISTS.STRIPES_COUNT.null",
                 "SYS.CACHE_GROUP_PAGE_LISTS.CACHED_PAGES_COUNT.null",
+                "SYS.CACHE_GROUP_PAGE_LISTS.PAGE_FREE_SPACE.null",
                 "SYS.DATA_REGION_PAGE_LISTS.NAME.null",
                 "SYS.DATA_REGION_PAGE_LISTS.BUCKET_NUMBER.null",
                 "SYS.DATA_REGION_PAGE_LISTS.BUCKET_SIZE.null",
                 "SYS.DATA_REGION_PAGE_LISTS.STRIPES_COUNT.null",
                 "SYS.DATA_REGION_PAGE_LISTS.CACHED_PAGES_COUNT.null",
+                "SYS.DATA_REGION_PAGE_LISTS.PAGE_FREE_SPACE.null",
                 "SYS.PARTITION_STATES.CACHE_GROUP_ID.null",
                 "SYS.PARTITION_STATES.PARTITION_ID.null",
                 "SYS.PARTITION_STATES.NODE_ID.null",

diff --git a/.../java/org/apache/ignite/internal/managers/systemview/walker/CachePagesListViewWalker.java b/.../java/org/apache/ignite/internal/managers/systemview/walker/CachePagesListViewWalker.java
@@ -58,6 +58,7 @@ public class CachePagesListViewWalker implements SystemViewRowAttributeWalker<Ca
         v.accept(4, "bucketSize", long.class);
         v.accept(5, "stripesCount", int.class);
         v.accept(6, "cachedPagesCount", int.class);
+        v.accept(7, "pageFreeSpace", int.class);
     }
 
     /** {@inheritDoc} */
@@ -69,10 +70,11 @@ public class CachePagesListViewWalker implements SystemViewRowAttributeWalker<Ca
         v.acceptLong(4, "bucketSize", row.bucketSize());
         v.acceptInt(5, "stripesCount", row.stripesCount());
         v.acceptInt(6, "cachedPagesCount", row.cachedPagesCount());
+        v.acceptInt(7, "pageFreeSpace", row.pageFreeSpace());
     }
 
     /** {@inheritDoc} */
     @Override public int count() {
-        return 7;
+        return 8;
     }
 }
diff --git a/.../main/java/org/apache/ignite/internal/managers/systemview/walker/PagesListViewWalker.java b/.../main/java/org/apache/ignite/internal/managers/systemview/walker/PagesListViewWalker.java
@@ -50,6 +50,7 @@ public class PagesListViewWalker implements SystemViewRowAttributeWalker<PagesLi
         v.accept(2, "bucketSize", long.class);
         v.accept(3, "stripesCount", int.class);
         v.accept(4, "cachedPagesCount", int.class);
+        v.accept(5, "pageFreeSpace", int.class);
     }
 
     /** {@inheritDoc} */
@@ -59,10 +60,11 @@ public class PagesListViewWalker implements SystemViewRowAttributeWalker<PagesLi
         v.acceptLong(2, "bucketSize", row.bucketSize());
         v.acceptInt(3, "stripesCount", row.stripesCount());
         v.acceptInt(4, "cachedPagesCount", row.cachedPagesCount());
+        v.acceptInt(5, "pageFreeSpace", row.pageFreeSpace());
     }
 
     /** {@inheritDoc} */
     @Override public int count() {
-        return 5;
+        return 6;
     }
 }
diff --git a/...va/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java b/...va/org/apache/ignite/internal/processors/cache/persistence/freelist/AbstractFreeList.java
@@ -478,6 +478,11 @@ public AbstractFreeList(
         init(metaPageId, initNew);
     }
 
+    /** {@inheritDoc} */
+    @Override public int getPageFreeSpace(int bucket) {
+        return bucket << shift;
+    }
+
     /**
      * Calculates free space tracked by this FreeListImpl instance.
      *

diff --git a/...main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java b/...main/java/org/apache/ignite/internal/processors/cache/persistence/freelist/PagesList.java
@@ -559,6 +559,13 @@ private void releaseAndClose(long pageId, long page, long pageAddr) {
         }
     }
 
+    /**
+     * Gets per page free space for specified bucket.
+     *
+     * @return Free space available to use for each page in specified bucket.
+     */
+    public abstract int getPageFreeSpace(int bucket);
+
     /**
      * Gets bucket index by page freespace.
      *

diff --git a/...ava/org/apache/ignite/internal/processors/cache/persistence/tree/reuse/ReuseListImpl.java b/...ava/org/apache/ignite/internal/processors/cache/persistence/tree/reuse/ReuseListImpl.java
@@ -117,6 +117,11 @@ public ReuseListImpl(
         return this.bucket;
     }
 
+    /** {@inheritDoc} */
+    @Override public int getPageFreeSpace(int bucket) {
+        return pageSize();
+    }
+
     /** {@inheritDoc} */
     @Override protected int getBucketIndex(int freeSpace) {
         return 0;

diff --git a/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java b/modules/core/src/main/java/org/apache/ignite/spi/systemview/view/PagesListView.java
@@ -80,4 +80,12 @@ public int stripesCount() {
     public int cachedPagesCount() {
         return pagesList.cachedPagesCount(bucket);
     }
+
+    /**
+     * @return Free space for each page in this bucket.
+     */
+    @Order(7)
+    public int pageFreeSpace() {
+        return pagesList.getPageFreeSpace(bucket);
+    }
 }
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/metric/SystemViewSelfTest.java
@@ -83,6 +83,7 @@
 import org.apache.ignite.internal.managers.systemview.walker.NodeAttributeViewWalker;
 import org.apache.ignite.internal.processors.cache.persistence.GridCacheDatabaseSharedManager;
 import org.apache.ignite.internal.processors.cache.persistence.IgniteCacheDatabaseSharedManager;
+import org.apache.ignite.internal.processors.cache.persistence.freelist.PagesList;
 import org.apache.ignite.internal.processors.metastorage.DistributedMetaStorage;
 import org.apache.ignite.internal.processors.metric.impl.PeriodicHistogramMetricImpl;
 import org.apache.ignite.internal.processors.odbc.jdbc.JdbcConnectionContext;
@@ -1858,6 +1859,29 @@ public void testPagesList() throws Exception {
             assertTrue(dr0flPages > 0);
             assertTrue(dr0flStripes > 0);
 
+            int bucketsCnt = ((PagesList)ignite.context().cache().context().database().freeList("dr0")).bucketsCount();
+            int[] bucketPagesSize = new int[bucketsCnt];
+
+            for (PagesListView pagesListView : dataRegionPageLists) {
+                int bucket = pagesListView.bucketNumber();
+
+                if (bucketPagesSize[bucket] == 0) {
+                    assertTrue(bucket == 0 || pagesListView.pageFreeSpace() != 0);
+                    bucketPagesSize[bucket] = pagesListView.pageFreeSpace();
+                }
+                else
+                    assertEquals(bucketPagesSize[bucket], pagesListView.pageFreeSpace());
+            }
+
+            int prev = 0;
+
+            for (int size : bucketPagesSize) {
+                if (size > 0) {
+                    assertTrue(size > prev);
+                    prev = size;
+                }
+            }
+
             SystemView<CachePagesListView> cacheGrpPageLists = ignite.context().systemView().view(CACHE_GRP_PAGE_LIST_VIEW);
 
             long dr1flPages = 0;