diff options
| author | Peter Portante <peter.portante@redhat.com> | 2012-10-15 11:46:12 -0400 |
|---|---|---|
| committer | Peter Portante <peter.portante@redhat.com> | 2013-04-29 16:35:55 -0400 |
| commit | 260ab35750bbe6af1970ad85aec4347e9acf0fc4 (patch) | |
| tree | 5e5a814070d4f1ac0357974e728e3498dfc9b19c | |
| parent | 39841dcbeab7ee50aa8332b498aa809c13d3d77e (diff) | |
object-storage: change logging of some errors to warnings
There are a number of errors logged which should probably be warnings, given
that the code recovers on those paths.
Change-Id: Ie643bbccb71e7b84ba76d68bac473d1dde663c44
BUG: 866557
Signed-off-by: Peter Portante <peter.portante@redhat.com>
Reviewed-on: http://review.gluster.org/4089
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Kaleb KEITHLEY <kkeithle@redhat.com>
Reviewed-by: Anand Avati <avati@redhat.com>
| -rw-r--r-- | swift/1.4.8/plugins/utils.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/swift/1.4.8/plugins/utils.py b/swift/1.4.8/plugins/utils.py index 7be857e..1c7eeb9 100644 --- a/swift/1.4.8/plugins/utils.py +++ b/swift/1.4.8/plugins/utils.py @@ -290,7 +290,7 @@ def check_valid_account(account, fs_object): def validate_container(metadata): if not metadata: - logging.error('No metadata') + logging.warn('validate_container: No metadata') return False if X_TYPE not in metadata.keys() or \ @@ -298,18 +298,18 @@ def validate_container(metadata): X_PUT_TIMESTAMP not in metadata.keys() or \ X_OBJECTS_COUNT not in metadata.keys() or \ X_BYTES_USED not in metadata.keys(): - #logging.error('Container error %s' % metadata) + #logging.warn('validate_container: Metadata missing entries: %s' % metadata) return False if metadata[X_TYPE] == CONTAINER: return True - logging.error('Container error %s' % metadata) + logging.warn('validate_container: metadata type is not CONTAINER (%r)' % (value,)) return False def validate_account(metadata): if not metadata: - logging.error('No metadata') + logging.warn('validate_account: No metadata') return False if X_TYPE not in metadata.keys() or \ @@ -318,18 +318,18 @@ def validate_account(metadata): X_OBJECTS_COUNT not in metadata.keys() or \ X_BYTES_USED not in metadata.keys() or \ X_CONTAINER_COUNT not in metadata.keys(): - #logging.error('Account error %s' % metadata) + #logging.warn('validate_account: Metadata missing entries: %s' % metadata) return False if metadata[X_TYPE] == ACCOUNT: return True - logging.error('Account error %s' % metadata) + logging.warn('validate_account: metadata type is not ACCOUNT (%r)' % (value,)) return False def validate_object(metadata): if not metadata: - logging.error('No metadata') + logging.warn('validate_object: No metadata') return False if X_TIMESTAMP not in metadata.keys() or \ @@ -338,22 +338,22 @@ def validate_object(metadata): X_CONTENT_LENGTH not in metadata.keys() or \ X_TYPE not in metadata.keys() or \ X_OBJECT_TYPE not in metadata.keys(): - #logging.error('Object error %s' % metadata) + #logging.warn('validate_object: Metadata missing entries: %s' % metadata) return False if metadata[X_TYPE] == OBJECT: return True - logging.error('Object error %s' % metadata) + logging.warn('validate_object: metadata type is not OBJECT (%r)' % (metadata[X_TYPE],)) return False def is_marker(metadata): if not metadata: - logging.error('No metadata') + logging.warn('is_marker: No metadata') return False if X_OBJECT_TYPE not in metadata.keys(): - logging.error('X_OBJECT_TYPE missing %s' % metadata) + logging.warn('is_marker: X_OBJECT_TYPE missing from metadata: %s' % metadata) return False if metadata[X_OBJECT_TYPE] == MARKER_DIR: @@ -608,7 +608,7 @@ def create_account_metadata(acc_path, memcache=None): def check_account_exists(account, fs_object): if account not in get_account_list(fs_object): - logging.error('Account not exists %s' % account) + logging.warn('Account %s does not exist' % account) return False else: return True |