On 08/15/2016 02:20 PM, Martin Babinsky wrote:
On 08/15/2016 02:13 PM, Martin Babinsky wrote:
On 08/12/2016 12:08 PM, Stanislav Laznicka wrote:
Hello,
topology disconnect/last-role-host removal errors would just be logged
during server uninstall even if ignore options are not present. The
host
would still appear in the topology even after "successful" uninstall.
https://fedorahosted.org/freeipa/ticket/6168
The patch seems to be ok, however shouldn't we use sys.exit() when
handling ServerRemovalError? Yes raising SystemExit from within a
function is a horrible practice, but it is already done on several other
places instead of letting the exception bubble up to the main handler.
CC'ing Jan for his thoughts on this since I may be wrong.
Hmm, you will definitely need sys.exit() here since otherwise
ipa-server-install reports 0 exit code even if there was an exception
thrown:
"""
[root@master1 ~]# ipa-server-install --uninstall -U
ipa : ERROR Server removal aborted: Deleting this server
will leave your installation without a DNS..
[root@master1 ~]# echo $?
0
"""
Because of #5750 (remove sys.exit() calls from installer modules) I
rather raise ScriptError in this case. See the modified patch. It
depends on either of my 48-4 or 48-5 patches (pick one).
From 6f7683fe0b9da6640a740bedf113bb3a9dc99bd1 Mon Sep 17 00:00:00 2001
From: Stanislav Laznicka <slazn...@redhat.com>
Date: Fri, 12 Aug 2016 11:59:41 +0200
Subject: [PATCH] Fail on topology disconnect/last role removal
Disconnecting topology/removing last-role-host during server
uninstallation should raise error rather than just being logged
if the appropriate ignore settings are not present.
https://fedorahosted.org/freeipa/ticket/6168
---
ipaserver/install/server/install.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py
index 8dc7a6820d214f15fb80fef29c7296fa237bc2a9..7a21126ac017dfad89cda9774fbec31c8818f745 100644
--- a/ipaserver/install/server/install.py
+++ b/ipaserver/install/server/install.py
@@ -294,7 +294,6 @@ def common_cleanup(func):
def remove_master_from_managed_topology(api_instance, options):
try:
# we may force the removal
- # if the master was already deleted we will just get a warning
server_del_options = dict(
force=True,
ignore_topology_disconnect=options.ignore_topology_disconnect,
@@ -303,8 +302,10 @@ def remove_master_from_managed_topology(api_instance, options):
replication.run_server_del_as_cli(
api_instance, api_instance.env.host, **server_del_options)
-
+ except errors.ServerRemovalError as e:
+ raise ScriptError(e)
except Exception as e:
+ # if the master was already deleted we will just get a warning
root_logger.warning("Failed to delete master: {}".format(e))
--
2.7.4
--
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code
