diff options
| author | Martin Basti <mbasti@redhat.com> | 2015-05-21 13:25:10 +0200 |
|---|---|---|
| committer | Petr Vobornik <pvoborni@redhat.com> | 2015-05-22 15:51:05 +0200 |
| commit | 3d17bf8e639616893d6937d98662ccc7541d1e23 (patch) | |
| tree | 2ecaa35b7c9c93e1b0f7f36e52fd737c1db356d2 /ipaserver | |
| parent | 98e4c6d6de130a0e94cd1705acc5418bdbda1eb1 (diff) | |
| download | freeipa-3d17bf8e639616893d6937d98662ccc7541d1e23.tar.gz freeipa-3d17bf8e639616893d6937d98662ccc7541d1e23.tar.xz freeipa-3d17bf8e639616893d6937d98662ccc7541d1e23.zip | |
Server Upgrade: wait until DS is ready
During server upgrade we should wait until DS is ready after restart, otherwise
connection error is raised.
Instead of 389 port, the DS socket is checked.
https://fedorahosted.org/freeipa/ticket/4904
Reviewed-By: Fraser Tweedale <ftweedal@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/upgradeinstance.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py index 2540df60f..d58c934bc 100644 --- a/ipaserver/install/upgradeinstance.py +++ b/ipaserver/install/upgradeinstance.py @@ -171,10 +171,8 @@ class IPAUpgrade(service.Service): self.schema_files = schema_files self.realm = realm_name - def __start_nowait(self): - # Don't wait here because we've turned off port 389. The connection - # we make will wait for the socket. - super(IPAUpgrade, self).start(wait=False) + def __start(self): + super(IPAUpgrade, self).start() def __stop_instance(self): """Stop only the main DS instance""" @@ -187,7 +185,7 @@ class IPAUpgrade(service.Service): self.step("saving configuration", self.__save_config) self.step("disabling listeners", self.__disable_listeners) self.step("enabling DS global lock", self.__enable_ds_global_write_lock) - self.step("starting directory server", self.__start_nowait) + self.step("starting directory server", self.__start) if self.schema_files: self.step("updating schema", self.__update_schema) self.step("upgrading server", self.__upgrade) |