From b9921ccc1e35240b93083edaa1cc51e4b16779e5 Mon Sep 17 00:00:00 2001 From: Adam Israel Date: Tue, 27 Aug 2019 12:50:06 -0400 Subject: [PATCH] Workaround for bug 816 Identified the root cause of bug 816 as a race condition in Juju 2.6.6, which will be fixed in the pending 2.6.7 release. In the meantime, this adds a workaround to dealing with the race condition by sleeping immediately after the model is created. Change-Id: Ief3d0bffe51cef0736f9819a2934e62412584fe4 Signed-off-by: Adam Israel --- modules/libjuju/juju/controller.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/modules/libjuju/juju/controller.py b/modules/libjuju/juju/controller.py index d3902ba..ed9b744 100644 --- a/modules/libjuju/juju/controller.py +++ b/modules/libjuju/juju/controller.py @@ -1,3 +1,16 @@ +# Copyright 2019 Canonical Ltd. +# +# Licensed 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. import asyncio import json import logging @@ -292,6 +305,13 @@ class Controller: owner, region ) + + # This is a temporary workaround for a race condition: + # https://bugs.launchpad.net/juju/+bug/1838774 + # This will be fixed when Juju 2.6.7 is released. + import time + time.sleep(5) + from juju.model import Model model = Model(jujudata=self._connector.jujudata) kwargs = self.connection().connect_params() -- 2.25.1