diff options
| author | Mohammed Junaid <junaid@redhat.com> | 2012-05-21 15:47:28 +0530 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2012-05-21 22:14:39 -0700 |
| commit | 93893b9ac06479bdfe28f94fce961594b928121a (patch) | |
| tree | 4db2b2f1e7757d78c6161685b6b8919f3e75be1a /swift/1.4.8/plugins/DiskDir.py | |
| parent | afc623f85e766a9006d7ba7cb81123ca3e10a719 (diff) | |
swift: Passing account name in container_update.
This patch also contains fixes to bugs
* 811501
* 812498
* 821310
Also, removed the default set of users in the proxy-server.conf file.
Change-Id: Ief83905d10ff7bf7c43685ada4d7f05959cee9d1
BUG: 821310
Signed-off-by: Mohammed Junaid <junaid@redhat.com>
Reviewed-on: http://review.gluster.com/3390
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'swift/1.4.8/plugins/DiskDir.py')
| -rw-r--r-- | swift/1.4.8/plugins/DiskDir.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swift/1.4.8/plugins/DiskDir.py b/swift/1.4.8/plugins/DiskDir.py index 4b8131671..28671be3c 100644 --- a/swift/1.4.8/plugins/DiskDir.py +++ b/swift/1.4.8/plugins/DiskDir.py @@ -220,14 +220,14 @@ class DiskDir(DiskCommon): self.metadata[X_BYTES_USED] = int(self.metadata[X_BYTES_USED]) - int(content_length) self.put_metadata(self.metadata) - def put_container(self, timestamp, object_count, bytes_used): + def put_container(self, container, put_timestamp, del_timestamp, object_count, bytes_used): """ For account server. """ self.metadata[X_OBJECTS_COUNT] = 0 self.metadata[X_BYTES_USED] = 0 self.metadata[X_CONTAINER_COUNT] = int(self.metadata[X_CONTAINER_COUNT]) + 1 - self.metadata[X_PUT_TIMESTAMP] = timestamp + self.metadata[X_PUT_TIMESTAMP] = 1 self.put_metadata(self.metadata) def delete_container(self, object_count, bytes_used): |