(flink-kubernetes-operator) 02/02: [hotfix] Handle missing busy time gracefully in IOMetricsInfo

[gy...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gyfora pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/flink-kubernetes-operator.git

commit 63d83393ed36e7148c7ac4174ee4503d3291f381
Author: Gyula Fora <g_...@apple.com>
AuthorDate: Wed Feb 28 15:05:06 2024 +0100

    [hotfix] Handle missing busy time gracefully in IOMetricsInfo
---
 .../rest/messages/job/metrics/IOMetricsInfo.java   |  6 ++--
 .../messages/job/metrics/IOMetricsInfoTest.java    | 41 ++++++++++++++++++++++
 2 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/flink-kubernetes-operator/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/IOMetricsInfo.java b/flink-kubernetes-operator/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/IOMetricsInfo.java
index accecbe3..711ba7ff 100644
--- a/flink-kubernetes-operator/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/IOMetricsInfo.java
+++ b/flink-kubernetes-operator/src/main/java/org/apache/flink/runtime/rest/messages/job/metrics/IOMetricsInfo.java
@@ -140,15 +140,15 @@ public final class IOMetricsInfo {
     }
 
     public long getAccumulatedBackpressured() {
-        return accumulatedBackpressured;
+        return accumulatedBackpressured != null ? accumulatedBackpressured : 0;
     }
 
     public double getAccumulatedBusy() {
-        return accumulatedBusy;
+        return accumulatedBusy != null ? accumulatedBusy : Double.NaN;
     }
 
     public long getAccumulatedIdle() {
-        return accumulatedIdle;
+        return accumulatedIdle != null ? accumulatedIdle : 0;
     }
 
     @Override
diff --git a/flink-kubernetes-operator/src/test/java/runtime/rest/messages/job/metrics/IOMetricsInfoTest.java b/flink-kubernetes-operator/src/test/java/runtime/rest/messages/job/metrics/IOMetricsInfoTest.java
new file mode 100644
index 00000000..4daed8e0
--- /dev/null
+++ b/flink-kubernetes-operator/src/test/java/runtime/rest/messages/job/metrics/IOMetricsInfoTest.java
@@ -0,0 +1,41 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package runtime.rest.messages.job.metrics;
+
+import org.apache.flink.runtime.rest.messages.job.metrics.IOMetricsInfo;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/** Tests for {@link org.apache.flink.runtime.rest.messages.job.metrics.IOMetricsInfo}. */
+public class IOMetricsInfoTest {
+
+    @Test
+    void testNullableAggregatedMetrics() {
+        var info1 = new IOMetricsInfo(0, false, 0, false, 0, false, 0, false, 1L, 2L, 3.4);
+        assertEquals(1, info1.getAccumulatedBackpressured());
+        assertEquals(2, info1.getAccumulatedIdle());
+        assertEquals(3.4, info1.getAccumulatedBusy());
+        var info2 = new IOMetricsInfo(0, false, 0, false, 0, false, 0, false, null, null, null);
+        assertEquals(0, info2.getAccumulatedBackpressured());
+        assertEquals(0, info2.getAccumulatedIdle());
+        assertEquals(Double.NaN, info2.getAccumulatedBusy());
+    }
+}