summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--openshift-storage-libs/openshiftstoragelibs/openshift_ops.py2
-rw-r--r--openshift-storage-libs/openshiftstoragelibs/openshift_storage_libs.py12
2 files changed, 12 insertions, 2 deletions
diff --git a/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py b/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
index b6d086a6..44834dc4 100644
--- a/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
+++ b/openshift-storage-libs/openshiftstoragelibs/openshift_ops.py
@@ -631,7 +631,7 @@ def create_namespace(hostname, namespace):
def wait_for_resource_absence(ocp_node, rtype, name,
- interval=5, timeout=300):
+ interval=5, timeout=600):
_waiter = waiter.Waiter(timeout=timeout, interval=interval)
resource, pv_name = None, None
for w in _waiter:
diff --git a/openshift-storage-libs/openshiftstoragelibs/openshift_storage_libs.py b/openshift-storage-libs/openshiftstoragelibs/openshift_storage_libs.py
index e9ad670d..aef63961 100644
--- a/openshift-storage-libs/openshiftstoragelibs/openshift_storage_libs.py
+++ b/openshift-storage-libs/openshiftstoragelibs/openshift_storage_libs.py
@@ -7,6 +7,7 @@ from openshiftstoragelibs.exceptions import (
NotSupportedException,
)
from openshiftstoragelibs.openshift_version import get_openshift_version
+from openshiftstoragelibs import waiter
MASTER_CONFIG_FILEPATH = "/etc/origin/master/master-config.yaml"
@@ -115,7 +116,16 @@ def enable_pvc_resize(master_node):
g.log.error(err_msg)
raise ExecutionError(err_msg)
- return True
+ # Wait for API service to be ready after the restart
+ for w in waiter.Waiter(timeout=120, interval=1):
+ try:
+ cmd_run("oc get nodes", master_node)
+ return True
+ except AssertionError:
+ continue
+ err_msg = "Exceeded 120s timeout waiting for OCP API to start responding."
+ g.log.error(err_msg)
+ raise ExecutionError(err_msg)
def get_iscsi_session(node, iqn=None, raise_on_error=True):