Merge remote-tracking branch 'apache/branch-4.15' into yong/port-chan…

…ges-4058
apache · Dec 7, 2023 · 7eabe09 · 7eabe09
2 parents 27582ab + 1fe42aa
commit 7eabe09
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf b/bookkeeper-server/src/test/resources/test_entry_location_rocksdb.conf
@@ -31,3 +31,5 @@
  write_buffer_size=1024
  # set by jni: options.setMaxWriteBufferNumber
  max_write_buffer_number=1
+  # set by jni: options.setLevelCompactionDynamicLevelBytes
+ level_compaction_dynamic_level_bytes=true
diff --git a/...rovider/src/test/java/org/apache/bookkeeper/stats/prometheus/TestPrometheusFormatter.java b/...rovider/src/test/java/org/apache/bookkeeper/stats/prometheus/TestPrometheusFormatter.java
@@ -208,7 +208,6 @@ public double get() {
             assertTrue(output.contains("# TYPE jvm_memory_direct_bytes_used gauge"));
             assertTrue(output.contains("# TYPE jvm_gc_collection_seconds summary"));
             assertTrue(output.contains("# TYPE jvm_memory_pool_bytes_committed gauge"));
-            assertTrue(output.contains("# TYPE process_cpu_seconds counter"));
         } catch (Exception e) {
             fail();
         }