From 18731b4bb5015d601ebd40c9e385eaa407727824 Mon Sep 17 00:00:00 2001 From: caleb miles Date: Tue, 23 Oct 2012 13:36:53 -0400 Subject: [PATCH] rgw_admin: do not throw error when start-date and end-date are not passed to usage::trim() Signed-off-by: caleb miles --- src/rgw/rgw_admin.cc | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc index 986819e407143..5a5b7406aafef 100644 --- a/src/rgw/rgw_admin.cc +++ b/src/rgw/rgw_admin.cc @@ -1584,18 +1584,25 @@ next: cerr << "do you really mean it? (requires --yes-i-really-mean-it)" << std::endl; return 1; } + int ret; uint64_t start_epoch = 0; uint64_t end_epoch = (uint64_t)-1; - int ret = parse_date(start_date, &start_epoch); - if (ret < 0) { - cerr << "ERROR: failed to parse start date" << std::endl; - return 1; + + if (!start_date.empty()) { + ret = parse_date(start_date, &start_epoch); + if (ret < 0) { + cerr << "ERROR: failed to parse start date" << std::endl; + return 1; + } } - ret = parse_date(end_date, &end_epoch); - if (ret < 0) { - cerr << "ERROR: failed to parse end date" << std::endl; - return 1; + + if (!end_date.empty()) { + ret = parse_date(end_date, &end_epoch); + if (ret < 0) { + cerr << "ERROR: failed to parse end date" << std::endl; + return 1; + } } ret = RGWUsage::trim(store, user_id, start_epoch, end_epoch); -- 2.39.5