diff --git a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocator.scala b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocator.scala index ef3547fd389f..8bc6e9340871 100644 --- a/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocator.scala +++ b/resource-managers/kubernetes/core/src/main/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocator.scala @@ -430,7 +430,7 @@ class ExecutorPodsAllocator( val reusablePVCs = createdPVCs .filterNot(pvc => pvcsInUse.contains(pvc.getMetadata.getName)) .filter(pvc => now - Instant.parse(pvc.getMetadata.getCreationTimestamp).toEpochMilli - > podAllocationDelay) + > podCreationTimeout) logInfo(log"Found ${MDC(LogKeys.COUNT, reusablePVCs.size)} reusable PVCs from " + log"${MDC(LogKeys.TOTAL, createdPVCs.size)} PVCs") reusablePVCs diff --git a/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocatorSuite.scala b/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocatorSuite.scala index 74a56729e86d..093f5ef3bcb7 100644 --- a/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocatorSuite.scala +++ b/resource-managers/kubernetes/core/src/test/scala/org/apache/spark/scheduler/cluster/k8s/ExecutorPodsAllocatorSuite.scala @@ -771,7 +771,7 @@ class ExecutorPodsAllocatorSuite extends SparkFunSuite with BeforeAndAfter { val pvc = persistentVolumeClaim("pvc-0", "gp2", "200Gi") pvc.getMetadata - .setCreationTimestamp(Instant.now().minus(podAllocationDelay + 1, MILLIS).toString) + .setCreationTimestamp(Instant.now().minus(podCreationTimeout + 1, MILLIS).toString) when(persistentVolumeClaimList.getItems).thenReturn(Seq(pvc).asJava) when(executorBuilder.buildFromFeatures(any(classOf[KubernetesExecutorConf]), meq(secMgr), meq(kubernetesClient), any(classOf[ResourceProfile]))) @@ -849,7 +849,7 @@ class ExecutorPodsAllocatorSuite extends SparkFunSuite with BeforeAndAfter { val pvc2 = persistentVolumeClaim("pvc-2", "gp2", "200Gi") val now = Instant.now() - pvc1.getMetadata.setCreationTimestamp(now.minus(2 * podAllocationDelay, MILLIS).toString) + pvc1.getMetadata.setCreationTimestamp(now.minus(podCreationTimeout + 1, MILLIS).toString) pvc2.getMetadata.setCreationTimestamp(now.toString) when(persistentVolumeClaimList.getItems).thenReturn(Seq(pvc1, pvc2).asJava)