This upgrade step is not used anymore. Required by: https://fedorahosted.org/freeipa/ticket/4904
Patch attached. -- Martin Basti
From caf35d4ed7fd5309fc4a547cc0342a8295c263ef Mon Sep 17 00:00:00 2001 From: Martin Basti <mba...@redhat.com> Date: Wed, 25 Feb 2015 17:55:11 +0100 Subject: [PATCH 1/5] Server Upgrade: Remove unused PRE_SCHEMA_UPDATE This is not used anymore. Ticket: https://fedorahosted.org/freeipa/ticket/4904 --- ipaserver/install/ipa_ldap_updater.py | 16 +++++++--------- ipaserver/install/ldapupdate.py | 15 +-------------- ipaserver/install/plugins/__init__.py | 1 - ipaserver/install/plugins/baseupdate.py | 14 +------------- ipaserver/install/plugins/dns.py | 3 +-- ipaserver/install/upgradeinstance.py | 17 ----------------- 6 files changed, 10 insertions(+), 56 deletions(-) diff --git a/ipaserver/install/ipa_ldap_updater.py b/ipaserver/install/ipa_ldap_updater.py index 18970ce409cab7abd801dcf048b7e7241609c98a..4ad7b972795e3aaacd1f5b43a2ad1e26b34a1367 100644 --- a/ipaserver/install/ipa_ldap_updater.py +++ b/ipaserver/install/ipa_ldap_updater.py @@ -191,15 +191,6 @@ class LDAPUpdater_NonUpgrade(LDAPUpdater): modified = False - ld = LDAPUpdate( - dm_password=self.dirman_password, - sub_dict={}, - live_run=not options.test, - ldapi=options.ldapi, - plugins=options.plugins or self.run_plugins) - - modified = ld.pre_schema_update(ordered=True) - if options.update_schema: modified = schemaupdate.update_schema( options.schema_files, @@ -207,6 +198,13 @@ class LDAPUpdater_NonUpgrade(LDAPUpdater): live_run=not options.test, ldapi=options.ldapi) or modified + ld = LDAPUpdate( + dm_password=self.dirman_password, + sub_dict={}, + live_run=not options.test, + ldapi=options.ldapi, + plugins=options.plugins or self.run_plugins) + if not self.files: self.files = ld.get_all_files(UPDATES_DIR) diff --git a/ipaserver/install/ldapupdate.py b/ipaserver/install/ldapupdate.py index 47f0399b928b3b0da3954592d56750450454aac7..53d5407d5e8a15abe13f2f6d8b3df74ca100ea5a 100644 --- a/ipaserver/install/ldapupdate.py +++ b/ipaserver/install/ldapupdate.py @@ -42,8 +42,7 @@ from ipalib import api from ipaplatform.paths import paths from ipapython.dn import DN from ipapython.ipa_log_manager import * -from ipaserver.install.plugins import (PRE_UPDATE, POST_UPDATE, - PRE_SCHEMA_UPDATE) +from ipaserver.install.plugins import (PRE_UPDATE, POST_UPDATE) from ipaserver.plugins import ldap2 UPDATES_DIR=paths.UPDATES_DIR @@ -803,18 +802,6 @@ class LDAPUpdate: for dn, update in sorted_updates: self._delete_record(update) - def pre_schema_update(self, ordered=False): - """Execute the update before the LDPA schema is updated. - """ - if self.plugins: - self.info('PRE_SCHEMA_UPDATE') - all_updates = {} - updates = api.Backend.updateclient.update(PRE_SCHEMA_UPDATE, self.dm_password, self.ldapi, self.live_run) - self.merge_updates(all_updates, updates) - self._run_updates(all_updates) - - return self.modified - def update(self, files, ordered=False): """Execute the update. files is a list of the update files to use. diff --git a/ipaserver/install/plugins/__init__.py b/ipaserver/install/plugins/__init__.py index 210c56ef79b7018a572ff92dc584ae15400596fe..49bef4df80d9b8ea2f5861dcb69c7ae2fb882472 100644 --- a/ipaserver/install/plugins/__init__.py +++ b/ipaserver/install/plugins/__init__.py @@ -20,7 +20,6 @@ """ Provide a separate api for updates. """ -PRE_SCHEMA_UPDATE = 0 PRE_UPDATE = 1 POST_UPDATE = 2 diff --git a/ipaserver/install/plugins/baseupdate.py b/ipaserver/install/plugins/baseupdate.py index dc6672ac5b1edeb4147686d1b05d9bf5d66f68b7..fa997c9dbe933be28fe462923a84cce338e05b6c 100644 --- a/ipaserver/install/plugins/baseupdate.py +++ b/ipaserver/install/plugins/baseupdate.py @@ -20,8 +20,7 @@ from ipalib import api from ipalib import Updater, Object from ipaserver.install import service -from ipaserver.install.plugins import (PRE_UPDATE, POST_UPDATE, - PRE_SCHEMA_UPDATE, MIDDLE) +from ipaserver.install.plugins import (PRE_UPDATE, POST_UPDATE, MIDDLE) class DSRestart(service.Service): """ @@ -57,17 +56,6 @@ class update(Object): api.register(update) -class PreSchemaUpdate(Updater): - """ - Base class for updates that run after file processing. - """ - updatetype = PRE_SCHEMA_UPDATE - order = MIDDLE - - def __init__(self): - super(PreSchemaUpdate, self).__init__() - - class PreUpdate(Updater): """ Base class for updates that run prior to file processing. diff --git a/ipaserver/install/plugins/dns.py b/ipaserver/install/plugins/dns.py index aa7bf5f0bbc0db6f10f047f390246cfbfda32b73..5f40be4926a7bcaf2853ff764761e18e54e51c7c 100644 --- a/ipaserver/install/plugins/dns.py +++ b/ipaserver/install/plugins/dns.py @@ -25,8 +25,7 @@ import time from ldif import LDIFWriter from ipaserver.install.plugins import MIDDLE, LAST -from ipaserver.install.plugins.baseupdate import (PostUpdate, PreUpdate, - PreSchemaUpdate) +from ipaserver.install.plugins.baseupdate import (PostUpdate, PreUpdate) from ipaserver.install import sysupgrade from ipalib import api, errors, util from ipapython.dn import DN diff --git a/ipaserver/install/upgradeinstance.py b/ipaserver/install/upgradeinstance.py index 622f2b8cfca6aa7e07452868a8c9264dd3b0f88d..95306fc3c1c13d9b37438d5caf75da43bde06361 100644 --- a/ipaserver/install/upgradeinstance.py +++ b/ipaserver/install/upgradeinstance.py @@ -77,7 +77,6 @@ class IPAUpgrade(service.Service): self.step("saving configuration", self.__save_config) self.step("disabling listeners", self.__disable_listeners) self.step("starting directory server", self.__start_nowait) - self.step("preparing server upgrade", self.__pre_schema_upgrade) if self.schema_files: self.step("updating schema", self.__update_schema) self.step("upgrading server", self.__upgrade) @@ -122,22 +121,6 @@ class IPAUpgrade(service.Service): installutils.set_directive(self.filename, 'nsslapd-ldapientrysearchbase', None, quotes=False, separator=':') - def __pre_schema_upgrade(self): - try: - ld = ldapupdate.LDAPUpdate(dm_password='', ldapi=True, live_run=self.live_run, plugins=True) - self.modified = (ld.pre_schema_update(ordered=True) or - self.modified) - except ldapupdate.BadSyntax, e: - root_logger.error('Bad syntax in pre schema upgrade %s' % str(e)) - self.modified = False - self.badsyntax = True - except Exception, e: - # Bad things happened, return gracefully - self.modified = False - self.upgradefailed = True - root_logger.error('Pre schema upgrade failed with %s' % str(e)) - root_logger.debug('%s', traceback.format_exc()) - def __update_schema(self): self.modified = schemaupdate.update_schema( self.schema_files, -- 2.1.0
-- 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
