[zeppelin] branch branch-0.9 updated: [HOTFIX] Zeppelin Kubernetes config

[pd...@apache.org]

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

pdallig pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/zeppelin.git


The following commit(s) were added to refs/heads/branch-0.9 by this push:
     new 453d6c8  [HOTFIX] Zeppelin Kubernetes config
453d6c8 is described below

commit 453d6c837a75cd9d33f2189a1244eefbbdcfd5bd
Author: Philipp Dallig <ph...@gmail.com>
AuthorDate: Mon Mar 1 13:57:43 2021 +0100

    [HOTFIX] Zeppelin Kubernetes config
    
    ### What is this PR for?
    I accidentally changed the programme flow with https://github.com/apache/zeppelin/commit/7bf1f248733a74a2ca674f17ce5165de214bba68.
    
    ### What type of PR is it?
     - Hotfix
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Philipp Dallig <ph...@gmail.com>
    
    Closes #4063 from Reamer/hotfix_k8s and squashes the following commits:
    
    a824d7147 [Philipp Dallig] Hotfix for zeppelin config
    
    (cherry picked from commit 0ce5c23af56760ccf9b9dacba1a7c27cd8e946d6)
    Signed-off-by: Philipp Dallig <ph...@gmail.com>
---
 .../zeppelin/interpreter/launcher/K8sRemoteInterpreterProcess.java      | 2 +-
 .../zeppelin/interpreter/launcher/K8sRemoteInterpreterProcessTest.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcess.java b/zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcess.java
index e4b39ae..13385d5 100644
--- a/zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcess.java
+++ b/zeppelin-plugins/launcher/k8s-standard/src/main/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcess.java
@@ -140,7 +140,7 @@ public class K8sRemoteInterpreterProcess extends RemoteInterpreterManagedProcess
     apply(specTemplates, false, templateProperties);
 
     // special handling if we doesn't want timeout the process during lifecycle phase pending
-    if (timeoutDuringPending) {
+    if (!timeoutDuringPending) {
       while (!StringUtils.equalsAnyIgnoreCase(getPodPhase(), "Succeeded", "Failed", "Running")
           && !Thread.currentThread().isInterrupted()) {
         try {
diff --git a/zeppelin-plugins/launcher/k8s-standard/src/test/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcessTest.java b/zeppelin-plugins/launcher/k8s-standard/src/test/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcessTest.java
index a8e9b30..9414411 100644
--- a/zeppelin-plugins/launcher/k8s-standard/src/test/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcessTest.java
+++ b/zeppelin-plugins/launcher/k8s-standard/src/test/java/org/apache/zeppelin/interpreter/launcher/K8sRemoteInterpreterProcessTest.java
@@ -503,7 +503,7 @@ public class K8sRemoteInterpreterProcessTest {
         3000,
         10,
         false,
-        true);
+        false);
     PodStatusSimulator podStatusSimulator = new PodStatusSimulator(server.getClient(), intp.getNamespace(), intp.getPodName(), intp);
     podStatusSimulator.setFirstPhase("Pending");
     podStatusSimulator.setSecondPhase("Pending");