From 0fd4343da9885471da5b3e52793e142b1832b2c2 Mon Sep 17 00:00:00 2001 From: Joe Gordon Date: Tue, 5 Mar 2013 01:11:45 +0000 Subject: [PATCH] Make nova-manage db archive_deleted_rows more explicit * max_rows must be positive Provide a better error message of 'nova-manage db archive_deleted_rows --max_rows=' is negative. * Requires a max_rows * No hidden default of 5000 Fix bug 1145609 Fix bug 1151064 Change-Id: I9078ff2700a0329ac4aff68bb434be5f16a5a3f1 --- bin/nova-manage | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/nova-manage b/bin/nova-manage index 0fde8ba0..274ae464 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -790,12 +790,15 @@ class DbCommands(object): @args('--max_rows', dest='max_rows', metavar='', help='Maximum number of deleted rows to archive') - def archive_deleted_rows(self, max_rows=None): + def archive_deleted_rows(self, max_rows): """Move up to max_rows deleted rows from production tables to shadow tables. """ if max_rows is not None: max_rows = int(max_rows) + if max_rows < 0: + print _("Must supply a positive value for max_rows") + sys.exit(1) admin_context = context.get_admin_context() db.archive_deleted_rows(admin_context, max_rows)