William Grant has proposed merging lp:~wgrant/launchpad/noro-config into lp:launchpad with lp:~wgrant/launchpad/noro as a prerequisite.
Requested reviews: Launchpad code reviewers (launchpad-reviewers) Related bugs: Bug #557271 in Launchpad itself: "Unable to remove config entries from the schema" https://bugs.launchpad.net/launchpad/+bug/557271 Bug #978768 in Launchpad itself: "read-only mode code is now dead code" https://bugs.launchpad.net/launchpad/+bug/978768 For more details, see: https://code.launchpad.net/~wgrant/launchpad/noro-config/+merge/118869 Drop the unused read-only mode and auth store config options. -- https://code.launchpad.net/~wgrant/launchpad/noro-config/+merge/118869 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/noro-config into lp:launchpad.
=== modified file 'configs/development/launchpad-lazr.conf' --- configs/development/launchpad-lazr.conf 2012-06-28 16:32:27 +0000 +++ configs/development/launchpad-lazr.conf 2012-08-09 04:52:21 +0000 @@ -61,19 +61,9 @@ voucher_proxy_port: 2323 purchase_subscription_url: http://ubuntu.recycledmania.com/product_info.php?products_id=227 - [database] rw_main_master: dbname=launchpad_dev rw_main_slave: dbname=launchpad_dev -# Use our _template databases here just so that we have different values from -# the rw_* configs. -ro_main_master: dbname=launchpad_dev_template -ro_main_slave: dbname=launchpad_dev_template - -# XXX stub 20100407 bug=557271: These next two are ignored, and should -# be removed after the May 2010 rollout. -auth_master: bug 557271 -auth_slave: bug 557271 [distributionmirrorprober] use_proxy: False === modified file 'configs/replicated-development/launchpad-lazr.conf' --- configs/replicated-development/launchpad-lazr.conf 2012-06-20 18:35:49 +0000 +++ configs/replicated-development/launchpad-lazr.conf 2012-08-09 04:52:21 +0000 @@ -8,5 +8,3 @@ [database] rw_main_master: dbname=launchpad_dev rw_main_slave: dbname=launchpad_dev port=5434 -ro_main_master: dbname=launchpad_dev -ro_main_slave: dbname=launchpad_dev port=5434 === modified file 'configs/test-playground/launchpad-lazr.conf' --- configs/test-playground/launchpad-lazr.conf 2010-03-26 20:35:31 +0000 +++ configs/test-playground/launchpad-lazr.conf 2012-08-09 04:52:21 +0000 @@ -8,5 +8,3 @@ [database] rw_main_master: dbname=launchpad_ftest_playground rw_main_slave: dbname=launchpad_ftest_playground -ro_main_master: dbname=launchpad_ftest_playground -ro_main_slave: dbname=launchpad_ftest_playground === modified file 'configs/testrunner/launchpad-lazr.conf' --- configs/testrunner/launchpad-lazr.conf 2012-05-20 23:49:27 +0000 +++ configs/testrunner/launchpad-lazr.conf 2012-08-09 04:52:21 +0000 @@ -25,10 +25,6 @@ [database] rw_main_master: dbname=launchpad_ftest host=localhost rw_main_slave: dbname=launchpad_ftest host=localhost -# Use our _template databases here just so that we have different values from -# the rw_* configs. -ro_main_master: dbname=launchpad_ftest_template host=localhost -ro_main_slave: dbname=launchpad_ftest_template host=localhost [error_reports] oops_prefix: T === modified file 'lib/lp/services/config/__init__.py' --- lib/lp/services/config/__init__.py 2012-08-09 04:52:20 +0000 +++ lib/lp/services/config/__init__.py 2012-08-09 04:52:21 +0000 @@ -420,13 +420,12 @@ _config_section = None _db_config_attrs = frozenset([ 'dbuser', - 'rw_main_master', 'rw_main_slave', 'ro_main_master', 'ro_main_slave', + 'rw_main_master', 'rw_main_slave', 'db_statement_timeout', 'db_statement_timeout_precision', 'isolation_level', 'soft_request_timeout', 'storm_cache', 'storm_cache_size']) _db_config_required_attrs = frozenset([ - 'dbuser', 'rw_main_master', 'rw_main_slave', 'ro_main_master', - 'ro_main_slave']) + 'dbuser', 'rw_main_master', 'rw_main_slave']) def __init__(self): self.reset() === modified file 'lib/lp/services/config/schema-lazr.conf' --- lib/lp/services/config/schema-lazr.conf 2012-08-06 09:29:34 +0000 +++ lib/lp/services/config/schema-lazr.conf 2012-08-09 04:52:21 +0000 @@ -469,17 +469,6 @@ rw_main_master: dbname=launchpad_prod_3 host=wildcherry.canonical.com # datatype: pgconnection rw_main_slave: dbname=launchpad_prod_2 host=chokecherry.canonical.com -# datatype: pgconnection -ro_main_master: dbname=launchpad_standalone_1 host=chokecherry.canonical.com -# datatype: pgconnection -ro_main_slave: dbname=launchpad_standalone_1 host=chokecherry.canonical.com - -# XXX stub 20100407 bug=557271: These next two are ignored, and should -# be removed after the May 2010 rollout. -# datatype: string -auth_master: ignored -# datatype: string -auth_slave: ignored # If the replication lag is more than this many seconds, slave databases # will not be used. === modified file 'lib/lp/services/librarian/client.py' --- lib/lp/services/librarian/client.py 2012-07-03 08:04:35 +0000 +++ lib/lp/services/librarian/client.py 2012-08-09 04:52:21 +0000 @@ -237,12 +237,7 @@ name = name.encode('utf-8') self._connect() try: - # Use dbconfig.rw_main_master directly here because it doesn't - # make sense to try and use ro_main_master (which might be - # returned if we use dbconfig.main_master). Note we can't - # use database introspection, as not all clients using this - # method have database access. - database_name = ConnectionString(dbconfig.rw_main_master).dbname + database_name = ConnectionString(dbconfig.main_master).dbname self._sendLine('STORE %d %s' % (size, name)) self._sendHeader('Database-Name', database_name) self._sendHeader('Content-Type', str(contentType)) === modified file 'lib/lp/services/scripts/__init__.py' --- lib/lp/services/scripts/__init__.py 2012-03-26 06:08:39 +0000 +++ lib/lp/services/scripts/__init__.py 2012-08-09 04:52:21 +0000 @@ -145,10 +145,6 @@ 'dbname=foo user=baz host=bar port=6432' >>> config.database.rw_main_slave 'dbname=foo user=baz host=bar port=6432' - >>> config.database.ro_main_master - 'dbname=foo user=baz host=bar port=6432' - >>> config.database.ro_main_slave - 'dbname=foo user=baz host=bar port=6432' Make sure that the default user is None @@ -164,8 +160,6 @@ connection_string_keys = [ 'rw_main_master', 'rw_main_slave', - 'ro_main_master', - 'ro_main_slave', ] config_data = ["[database]"] for con_str_key in connection_string_keys:
_______________________________________________ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : [email protected] Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
