diff options
| author | Peter Portante <peter.portante@redhat.com> | 2012-10-15 11:46:12 -0400 |
|---|---|---|
| committer | Anand Avati <avati@redhat.com> | 2012-10-16 14:20:48 -0700 |
| commit | 22050e51e876c5756e255cd707036cca8b8d544c (patch) | |
| tree | 2d95fb9d2d8b50868ef7491d9abf775790955d1d /swift | |
| parent | ddb4652c30dc26bdb1548a35e2e970a032d4d290 (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>
Diffstat (limited to 'swift')
| -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 7be857e9513..1c7eeb92f54 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 |