Merge branch 'wip-rgw-geo-enovance' into wip-rgw-geo-2

Conflicts:
	src/Makefile.am
	src/rgw/rgw_admin.cc

Signed-off-by: Yehuda Sadeh <yehuda@inktank.com>

14 files changed, 1827 insertions, 64 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 7762cbb50fc..0e36f8fcc5e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -418,6 +418,8 @@ radosgw_SOURCES = \
         rgw/rgw_rest_user.cc \
         rgw/rgw_rest_bucket.cc \
         rgw/rgw_rest_metadata.cc \
+        rgw/rgw_rest_log.cc \
+        rgw/rgw_http_client.cc \
         rgw/rgw_swift.cc \
 	rgw/rgw_swift_auth.cc \
 	rgw/rgw_main.cc
@@ -946,6 +948,13 @@ unittest_rgw_meta_LDADD = librgw.a ${UNITTEST_LDADD} ${UNITTEST_STATIC_LDADD} -l
  libcls_log_client.a libcls_refcount_client.a libcls_rgw_client.a libcls_lock_client.a
 unittest_rgw_meta_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
 check_PROGRAMS += unittest_rgw_meta
+
+unittest_rgw_log_SOURCES = test/test_rgw_admin_log.cc
+unittest_rgw_log_LDFLAGS = libglobal.la 
+unittest_rgw_log_LDADD = librgw.a ${UNITTEST_LDADD} ${UNITTEST_STATIC_LDADD} -lcryptopp -lcurl -luuid -lexpat  librados.la libcls_version_client.a \
+ libcls_log_client.a libcls_refcount_client.a libcls_rgw_client.a libcls_lock_client.a
+unittest_rgw_log_CXXFLAGS = ${AM_CXXFLAGS} ${UNITTEST_CXXFLAGS}
+check_PROGRAMS += unittest_rgw_log
 endif
 
 ceph_test_librbd_SOURCES = test/librbd/test_librbd.cc test/librados/test.cc
@@ -2086,6 +2095,7 @@ noinst_HEADERS = \
 	rgw/rgw_rest_conn.h\
 	rgw/rgw_tools.h\
 	rgw/rgw_rest_metadata.h\
+  rgw/rgw_rest_log.h\
 	rgw/rgw_usage.h\
 	rgw/rgw_user.h\
 	rgw/rgw_bucket.h\
diff --git a/src/cls/log/cls_log.cc b/src/cls/log/cls_log.cc
index ac5efc4f0b5..82616fd9712 100644
--- a/src/cls/log/cls_log.cc
+++ b/src/cls/log/cls_log.cc
@@ -110,7 +110,7 @@ static int cls_log_list(cls_method_context_t hctx, bufferlist *in, bufferlist *o
   } else {
     from_index = op.marker;
   }
-  bool use_time_boundary = (op.to_time > op.from_time);
+  bool use_time_boundary = ((!op.from_time.is_zero()) && (op.to_time >= op.from_time));
 
   if (use_time_boundary)
     get_index_time_prefix(op.to_time, to_index);
diff --git a/src/cls/rgw/cls_rgw.cc b/src/cls/rgw/cls_rgw.cc
index 464eb26038b..40394650e28 100644
--- a/src/cls/rgw/cls_rgw.cc
+++ b/src/cls/rgw/cls_rgw.cc
@@ -746,6 +746,8 @@ static int bi_log_iterate_entries(cls_method_context_t hctx, const string& marke
 
   map<string, bufferlist> keys;
   string filter_prefix, end_key;
+  bufferlist start_bl;
+  bool start_key_added;
   uint32_t i = 0;
   string key;
 
@@ -759,6 +761,10 @@ static int bi_log_iterate_entries(cls_method_context_t hctx, const string& marke
     key.append(marker);
 
     start_key = key;
+    int ret = cls_cxx_map_get_val(hctx, start_key, &start_bl);
+    if ((ret < 0) && (ret != -ENOENT)) {
+        return ret;
+    } 
   } else {
     start_key = key_iter;
   }
@@ -782,7 +788,10 @@ static int bi_log_iterate_entries(cls_method_context_t hctx, const string& marke
     if (ret < 0)
       return ret;
 
-
+    if ((start_bl.length() > 0) && (!start_key_added)) {
+      keys[start_key] = start_bl;
+      start_key_added = true;
+    }
     map<string, bufferlist>::iterator iter = keys.begin();
     if (iter == keys.end())
       break;
@@ -793,7 +802,7 @@ static int bi_log_iterate_entries(cls_method_context_t hctx, const string& marke
 
       CLS_LOG(0, "bi_log_iterate_entries key=%s bl.length=%d\n", key.c_str(), (int)iter->second.length());
 
-      if (key.compare(end_key) >= 0)
+      if (key.compare(end_key) > 0)
         return 0;
 
       ret = bi_log_record_decode(iter->second, e);
diff --git a/src/cls/rgw/cls_rgw_types.cc b/src/cls/rgw/cls_rgw_types.cc
index e2b7a07f165..2adb78fd3f2 100644
--- a/src/cls/rgw/cls_rgw_types.cc
+++ b/src/cls/rgw/cls_rgw_types.cc
@@ -133,7 +133,7 @@ void rgw_bi_log_entry::dump(Formatter *f) const
   }
 
   f->dump_int("index_ver", index_ver);
-  f->dump_stream("timestamp") << timestamp;
+  timestamp.gmtime(f->dump_stream("timestamp"));
   f->open_object_section("ver");
   ver.dump(f);
   f->close_section();
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 12f08aadd91..e62f65019bc 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -644,6 +644,7 @@ int main(int argc, char **argv)
   int max_entries = -1;
   int system = false;
   bool system_specified = false;
+  int shard_id = 0;
 
   std::string val;
   std::ostringstream errs;
@@ -711,6 +712,8 @@ int main(int argc, char **argv)
       start_date = val;
     } else if (ceph_argparse_witharg(args, i, &val, "--end-date", "--end-time", (char*)NULL)) {
       end_date = val;
+    } else if (ceph_argparse_witharg(args, i, &val, "--shard-id", (char*)NULL)) {
+      shard_id = atoi(val.c_str());
     } else if (ceph_argparse_witharg(args, i, &val, "--access", (char*)NULL)) {
       access = val;
       perm_mask = rgw_str_to_perm(access.c_str());
@@ -1768,7 +1771,7 @@ next:
 
     RGWMetadataLog *meta_log = store->meta_mgr->get_log();
 
-    meta_log->init_list_entries(store, start_time, end_time, &handle);
+    meta_log->init_list_entries(shard_id, start_time, end_time, &handle);
 
     bool truncated;
 
@@ -1804,7 +1807,7 @@ next:
 
     RGWMetadataLog *meta_log = store->meta_mgr->get_log();
 
-    ret = meta_log->trim(store, start_time, end_time);
+    ret = meta_log->trim(shard_id, start_time, end_time);
     if (ret < 0) {
       cerr << "ERROR: meta_log->trim(): " << cpp_strerror(-ret) << std::endl;
       return -ret;
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index 87209bc54d9..f19c5d7c8a4 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -41,6 +41,7 @@
 #include "rgw_rest_user.h"
 #include "rgw_rest_bucket.h"
 #include "rgw_rest_metadata.h"
+#include "rgw_rest_log.h"
 #include "rgw_swift_auth.h"
 #include "rgw_swift.h"
 #include "rgw_log.h"
@@ -500,8 +501,8 @@ int main(int argc, const char **argv)
   
     /*Registering resource for /admin/metadata */
     admin_resource->register_resource("metadata", new RGWRESTMgr_Metadata);
+    admin_resource->register_resource("log", new RGWRESTMgr_Log);
     rest.register_resource(g_conf->rgw_admin_entry, admin_resource);
-    rgw_user_init(store->meta_mgr);
   }
 
   OpsLogSocket *olog = NULL;
diff --git a/src/rgw/rgw_metadata.cc b/src/rgw/rgw_metadata.cc
index d3e39daab19..105a3465461 100644
--- a/src/rgw/rgw_metadata.cc
+++ b/src/rgw/rgw_metadata.cc
@@ -79,14 +79,15 @@ int RGWMetadataLog::add_entry(RGWRados *store, string& section, string& key, buf
   return store->time_log_add(oid, now, section, key, bl);
 }
 
-void RGWMetadataLog::init_list_entries(RGWRados *store, utime_t& from_time, utime_t& end_time, void **handle)
+void RGWMetadataLog::init_list_entries(int shard_id, utime_t& from_time, utime_t& end_time, void **handle)
 {
-  LogListCtx *ctx = new LogListCtx(store);
+  LogListCtx *ctx = new LogListCtx();
 
+  ctx->cur_shard = shard_id;
   ctx->from_time = from_time;
   ctx->end_time = end_time;
 
-  get_shard_oid(0, ctx->cur_oid);
+  get_shard_oid(ctx->cur_shard, ctx->cur_oid);
 
   *handle = (void *)ctx;
 }
@@ -102,65 +103,51 @@ int RGWMetadataLog::list_entries(void *handle,
                  bool *truncated) {
   LogListCtx *ctx = (LogListCtx *)handle;
 
-  if (ctx->done || !max_entries) {
+  if (!max_entries) {
     *truncated = false;
     return 0;
   }
 
   entries.clear();
 
-  do {
-    list<cls_log_entry> ents;
-    bool is_truncated;
-    int ret = store->time_log_list(ctx->cur_oid, ctx->from_time, ctx->end_time,
-                                 max_entries - entries.size(), ents, ctx->marker, &is_truncated);
-    if (ret == -ENOENT) {
-      is_truncated = false;
-      ret = 0;
-    }
-    if (ret < 0)
-      return ret;
-
-    if (ents.size()) {
-      entries.splice(entries.end(), ents);
-    }
-
-    if (!is_truncated) {
-      ++ctx->cur_shard;
-      if (ctx->cur_shard < cct->_conf->rgw_md_log_max_shards) {
-        get_shard_oid(ctx->cur_shard, ctx->cur_oid);
-        ctx->marker.clear();
-      } else {
-        ctx->done = true;
-        break;
-      }
-    }
-  } while (entries.size() < (size_t)max_entries);
-
-  *truncated = !ctx->done;
-
+  int ret = store->time_log_list(ctx->cur_oid, ctx->from_time, ctx->end_time,
+                                 max_entries, entries, ctx->marker, truncated);
+  if ((ret < 0) && (ret != -ENOENT))
+    return ret;
   return 0;
 }
 
-int RGWMetadataLog::trim(RGWRados *store, utime_t& from_time, utime_t& end_time)
+int RGWMetadataLog::trim(int shard_id, utime_t& from_time, utime_t& end_time)
 {
   string oid;
-  for (int shard = 0; shard < cct->_conf->rgw_md_log_max_shards; shard++) {
-    get_shard_oid(shard, oid);
+  get_shard_oid(shard_id, oid);
 
-    int ret;
+  int ret;
 
-    ret = store->time_log_trim(oid, from_time, end_time);
+  ret = store->time_log_trim(oid, from_time, end_time);
 
-    if (ret == -ENOENT)
-      ret = 0;
+  if (ret == -ENOENT)
+    ret = 0;
 
-    if (ret < 0)
-      return ret;
-  }
+  if (ret < 0)
+    return ret;
 
   return 0;
 }
+  
+int RGWMetadataLog::lock_exclusive(int shard_id, utime_t& duration, string& owner_id) {
+  string oid;
+  get_shard_oid(shard_id, oid);
+
+  return store->log_lock_exclusive(oid, duration, owner_id);
+}
+
+int RGWMetadataLog::unlock(int shard_id, string& owner_id) {
+  string oid;
+  get_shard_oid(shard_id, oid);
+
+  return store->log_unlock(oid, owner_id);
+}
 
 obj_version& RGWMetadataObject::get_version()
 {
diff --git a/src/rgw/rgw_metadata.h b/src/rgw/rgw_metadata.h
index 46a90b826e8..299b3ff35b3 100644
--- a/src/rgw/rgw_metadata.h
+++ b/src/rgw/rgw_metadata.h
@@ -76,7 +76,6 @@ public:
   int add_entry(RGWRados *store, string& section, string& key, bufferlist& bl);
 
   struct LogListCtx {
-    RGWRados *store;
     int cur_shard;
     string marker;
     utime_t from_time;
@@ -86,17 +85,19 @@ public:
 
     bool done;
 
-    LogListCtx(RGWRados *_store) : store(_store), cur_shard(0), done(false) {}
+    LogListCtx() : done(false) {}
   };
 
-  void init_list_entries(RGWRados *store, utime_t& from_time, utime_t& end_time, void **handle);
+  void init_list_entries(int shard_id, utime_t& from_time, utime_t& end_time, void **handle);
   void complete_list_entries(void *handle);
   int list_entries(void *handle,
                    int max_entries,
                    list<cls_log_entry>& entries,
                    bool *truncated);
 
-  int trim(RGWRados *store, utime_t& from_time, utime_t& end_time);
+  int trim(int shard_id, utime_t& from_time, utime_t& end_time);
+  int lock_exclusive(int shard_id, utime_t& duration, string& owner_id);
+  int unlock(int shard_id, string& owner_id);
 };
 
 class RGWMetadataLogData;
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc
index 73e0c48f6a8..7eff15f3ade 100644
--- a/src/rgw/rgw_rados.cc
+++ b/src/rgw/rgw_rados.cc
@@ -19,6 +19,7 @@
 #include "cls/refcount/cls_refcount_client.h"
 #include "cls/version/cls_version_client.h"
 #include "cls/log/cls_log_client.h"
+#include "cls/lock/cls_lock_client.h"
 
 #include "rgw_tools.h"
 
@@ -57,7 +58,7 @@ static string region_info_oid_prefix = "region_info.";
 
 static string default_region_info_oid = "default.region";
 static string region_map_oid = "region_map";
-
+static string rgw_log_lock_name = "rgw_process";
 
 static RGWObjCategory main_category = RGW_OBJ_CATEGORY_MAIN;
 
@@ -1216,6 +1217,31 @@ int RGWRados::time_log_trim(const string& oid, utime_t& start_time, utime_t& end
   return cls_log_trim(io_ctx, oid, start_time, end_time);
 }
 
+int RGWRados::log_lock_exclusive(const string& oid, utime_t& duration, string& owner_id) {
+  librados::IoCtx io_ctx;
+
+  const char *log_pool = zone.log_pool.name.c_str();
+  int r = rados->ioctx_create(log_pool, io_ctx);
+  if (r < 0)
+    return r;
+  rados::cls::lock::Lock l(rgw_log_lock_name);
+  l.set_duration(duration);
+  l.set_cookie(owner_id);
+  return l.lock_exclusive(&io_ctx, oid);
+}
+
+int RGWRados::log_unlock(const string& oid, string& owner_id) {
+  librados::IoCtx io_ctx;
+
+  const char *log_pool = zone.log_pool.name.c_str();
+  int r = rados->ioctx_create(log_pool, io_ctx);
+  if (r < 0)
+    return r;
+  rados::cls::lock::Lock l(rgw_log_lock_name);
+  l.set_cookie(owner_id);
+  return l.unlock(&io_ctx, oid);
+}
+
 int RGWRados::decode_policy(bufferlist& bl, ACLOwner *owner)
 {
   bufferlist::iterator i = bl.begin();
@@ -1713,7 +1739,7 @@ int RGWRados::put_obj_meta_impl(void *ctx, rgw_obj& obj,  uint64_t size,
     index_tag = state->write_tag;
   }
 
-  r = prepare_update_index(NULL, bucket, obj, index_tag);
+  r = prepare_update_index(NULL, bucket, CLS_RGW_OP_ADD, obj, index_tag);
   if (r < 0)
     return r;
 
@@ -2376,7 +2402,7 @@ int RGWRados::delete_obj_impl(void *ctx, rgw_obj& obj)
   bool ret_not_existed = (state && !state->exists);
 
   string tag;
-  r = prepare_update_index(state, bucket, obj, tag);
+  r = prepare_update_index(state, bucket, CLS_RGW_OP_DEL, obj, tag);
   if (r < 0)
     return r;
   cls_refcount_put(op, tag, true);
@@ -2945,7 +2971,7 @@ done_err:
 }
 
 int RGWRados::prepare_update_index(RGWObjState *state, rgw_bucket& bucket,
-                                   rgw_obj& obj, string& tag)
+                                   RGWModifyOp op, rgw_obj& obj, string& tag)
 {
   if (bucket_is_system(bucket))
     return 0;
@@ -2967,7 +2993,7 @@ int RGWRados::prepare_update_index(RGWObjState *state, rgw_bucket& bucket,
       append_rand_alpha(cct, tag, tag, 32);
     }
   }
-  ret = cls_obj_prepare_op(bucket, CLS_RGW_OP_ADD, tag,
+  ret = cls_obj_prepare_op(bucket, op, tag,
                                obj.object, obj.key);
 
   return ret;
@@ -3101,7 +3127,7 @@ int RGWRados::clone_objs_impl(void *ctx, rgw_obj& dst_obj,
   int ret;
 
   if (update_index) {
-    ret = prepare_update_index(state, bucket, dst_obj, tag);
+    ret = prepare_update_index(state, bucket, CLS_RGW_OP_ADD, dst_obj, tag);
     if (ret < 0)
       goto done;
   }
diff --git a/src/rgw/rgw_rados.h b/src/rgw/rgw_rados.h
index 5eb300784d1..9a723b74eec 100644
--- a/src/rgw/rgw_rados.h
+++ b/src/rgw/rgw_rados.h
@@ -948,7 +948,7 @@ public:
                       string *last_entry, bool (*force_check_filter)(const string&  name) = NULL);
   int cls_bucket_head(rgw_bucket& bucket, struct rgw_bucket_dir_header& header);
   int prepare_update_index(RGWObjState *state, rgw_bucket& bucket,
-                           rgw_obj& oid, string& tag);
+                           RGWModifyOp op, rgw_obj& oid, string& tag);
   int complete_update_index(rgw_bucket& bucket, string& oid, string& tag, int64_t poolid, uint64_t epoch, uint64_t size,
                             utime_t& ut, string& etag, string& content_type, bufferlist *acl_bl, RGWObjCategory category,
 			    list<string> *remove_objs);
@@ -980,6 +980,8 @@ public:
   int time_log_list(const string& oid, utime_t& start_time, utime_t& end_time,
                     int max_entries, list<cls_log_entry>& entries, string& marker, bool *truncated);
   int time_log_trim(const string& oid, utime_t& start_time, utime_t& end_time);
+  int log_lock_exclusive(const string& oid, utime_t& duration, string& owner_id);
+  int log_unlock(const string& oid, string& owner_id);
 
   /// clean up/process any temporary objects older than given date[/time]
   int remove_temp_objects(string date, string time);
diff --git a/src/rgw/rgw_rest_log.cc b/src/rgw/rgw_rest_log.cc
new file mode 100644
index 00000000000..97c4b288d27
--- /dev/null
+++ b/src/rgw/rgw_rest_log.cc
@@ -0,0 +1,359 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation. See file COPYING.
+ *
+ */
+#include "common/ceph_json.h"
+#include "common/strtol.h"
+#include "rgw_rest.h"
+#include "rgw_op.h"
+#include "rgw_rest_s3.h"
+#include "rgw_rest_log.h"
+#include "rgw_client_io.h"
+#include "common/errno.h"
+
+#define dout_subsys ceph_subsys_rgw
+
+static int parse_date_str(string& in, utime_t& out) {
+  uint64_t epoch = 0;
+
+  if (!in.empty()) {
+    if (parse_date(in, &epoch) < 0) {
+      dout(5) << "Error parsing date " << in << dendl;
+      return -EINVAL;
+    }
+  }
+  out = utime_t(epoch, 0);
+  return 0;
+}
+
+void RGWOp_MDLog_List::execute() {
+  string   shard = s->info.args.get("id");
+
+  string   st = s->info.args.get("start-time"),
+           et = s->info.args.get("end-time"),
+           err;
+  utime_t  ut_st, 
+           ut_et;
+  void    *handle;
+  int      shard_id;
+
+  shard_id = strict_strtol(shard.c_str(), 10, &err);
+  if (!err.empty()) {
+    dout(5) << "Error parsing shard_id " << shard << dendl;
+    http_ret = -EINVAL;
+    return;
+  }
+
+  if (parse_date_str(st, ut_st) < 0) {
+    http_ret = -EINVAL;
+    return;
+  }
+
+  if (parse_date_str(et, ut_et) < 0) {
+    http_ret = -EINVAL;
+    return;
+  }
+
+  RGWMetadataLog *meta_log = store->meta_mgr->get_log();
+
+  meta_log->init_list_entries(shard_id, ut_st, ut_et, &handle);
+
+  bool truncated;
+
+  http_ret = meta_log->list_entries(handle, 1000, entries, &truncated);
+}
+
+void RGWOp_MDLog_List::send_response() {
+  set_req_state_err(s, http_ret);
+  dump_errno(s);
+  end_header(s);
+
+  if (http_ret < 0)
+    return;
+
+  s->formatter->open_array_section("entries");
+  for (list<cls_log_entry>::iterator iter = entries.begin(); 
+       iter != entries.end(); ++iter) {
+    cls_log_entry& entry = *iter;
+    store->meta_mgr->dump_log_entry(entry, s->formatter);
+    flusher.flush();
+  }
+  s->formatter->close_section();
+  flusher.flush();
+}
+
+void RGWOp_MDLog_GetShardsInfo::execute() {
+  num_objects = s->cct->_conf->rgw_md_log_max_shards;
+  http_ret = 0;
+}
+
+void RGWOp_MDLog_GetShardsInfo::send_response() {
+  set_req_state_err(s, http_ret);
+  dump_errno(s);
+  end_header(s);
+
+  s->formatter->open_object_section("num_objects");
+  s->formatter->dump_unsigned("num_objects", num_objects);
+  s->formatter->close_section();
+  flusher.flush();
+}
+
+void RGWOp_MDLog_Delete::execute() {
+  string   st = s->info.args.get("start-time"),
+           et = s->info.args.get("end-time"),
+           shard = s->info.args.get("id"),
+           err;
+  utime_t  ut_st, 
+           ut_et;
+  int     shard_id;
+
+  http_ret = 0;
+
+  shard_id = strict_strtol(shard.c_str(), 10, &err);
+  if (!err.empty()) {
+    dout(5) << "Error parsing shard_id " << shard << dendl;
+    http_ret = -EINVAL;
+    return;
+  }
+  if (st.empty() || et.empty()) {
+    http_ret = -EINVAL;
+    return;
+  }
+
+  if (parse_date_str(st, ut_st) < 0) {
+    http_ret = -EINVAL;
+    return;
+  }
+
+  if (parse_date_str(et, ut_et) < 0) {
+    http_ret = -EINVAL;
+    return;
+  }
+  RGWMetadataLog *meta_log = store->meta_mgr->get_log();
+
+  http_ret = meta_log->trim(shard_id, ut_st, ut_et);
+}
+
+int RGWOp_MDLog_Post::check_caps(RGWUserCaps& caps) {
+  if (caps.check_cap("mdlog", RGW_CAP_READ) &&
+      caps.check_cap("mdlog", RGW_CAP_WRITE)) {
+    return -EPERM;
+  }
+  return 0;
+}
+
+const char *RGWOp_MDLog_Post::name() {
+  int pt = get_post_type();
+  if (pt == MDLOG_POST_LOCK) 
+    return "lock mdlog object";
+  else if (pt == MDLOG_POST_UNLOCK)
+    return "unlock mdlog object";
+  return NULL;
+}
+
+void RGWOp_MDLog_Post::execute() {
+  string shard_id_str, duration_str, lock_id;
+  int shard_id;
+  int pt = get_post_type();
+
+  http_ret = 0;
+
+  shard_id_str = s->info.args.get("id");
+  if (pt == MDLOG_POST_LOCK)
+    duration_str = s->info.args.get("length");
+  lock_id      = s->info.args.get("lock_id");
+
+  if (shard_id_str.empty() ||
+      (pt == MDLOG_POST_LOCK && duration_str.empty()) ||
+      lock_id.empty()) {
+    dout(5) << "Error invalid parameter list" << dendl;
+    http_ret = -EINVAL;
+    return;
+  }
+
+  string err;
+  shard_id = strict_strtol(shard_id_str.c_str(), 10, &err);
+  if (!err.empty()) {
+    dout(5) << "Error parsing shard_id param " << shard_id_str << dendl;
+    http_ret = -EINVAL;
+    return;
+  }
+
+  RGWMetadataLog *meta_log = store->meta_mgr->get_log();
+  if (pt == MDLOG_POST_LOCK) {
+    int dur;
+    dur = strict_strtol(duration_str.c_str(), 10, &err);
+    if (!err.empty() || dur <= 0) {
+      dout(5) << "invalid length param " << duration_str << dendl;
+      http_ret = -EINVAL;
+      return;
+    }
+    utime_t time(dur, 0);
+    http_ret = meta_log->lock_exclusive(shard_id, time, lock_id);
+  } else if (pt == MDLOG_POST_UNLOCK) {
+    http_ret = meta_log->unlock(shard_id, lock_id);
+  } else 
+    http_ret = -EINVAL;
+}
+
+void RGWOp_BILog_List::execute() {
+  string bucket_name = s->info.args.get("bucket"),
+         marker = s->info.args.get("marker"),
+         max_entries_str = s->info.args.get("max-entries");
+  RGWBucketInfo bucket_info;
+  int max_entries;
+
+  if (bucket_name.empty()) {
+    dout(5) << "ERROR: bucket not specified" << dendl;
+    http_ret = -EINVAL;
+    return;
+  }
+
+  http_ret = store->get_bucket_info(NULL, bucket_name, bucket_info, NULL);
+  if (http_ret < 0) {
+    dout(5) << "could not get bucket info for bucket=" << bucket_name << dendl;
+    return;
+  }
+
+  bool truncated;
+  int count = 0;
+  string err;
+
+  max_entries = strict_strtol(max_entries_str.c_str(), 10, &err);
+  if (!err.empty())
+    max_entries = 1000;
+
+  send_response();
+  do {
+    list<rgw_bi_log_entry> entries;
+    int ret = store->list_bi_log_entries(bucket_info.bucket, 
+                                          marker, max_entries - count, 
+                                          entries, &truncated);
+    if (ret < 0) {
+      dout(5) << "ERROR: list_bi_log_entries()" << dendl;
+      return;
+    }
+
+    count += entries.size();
+
+    send_response(entries, marker);
+  } while (truncated && count < max_entries);
+
+  send_response_end();
+}
+
+void RGWOp_BILog_List::send_response() {
+  if (sent_header)
+    return;
+
+  set_req_state_err(s, http_ret);
+  dump_errno(s);
+  end_header(s);
+
+  sent_header = true;
+
+  if (http_ret < 0)
+    return;
+
+  s->formatter->open_array_section("entries");
+}
+
+void RGWOp_BILog_List::send_response(list<rgw_bi_log_entry>& entries, string& marker)
+{
+  for (list<rgw_bi_log_entry>::iterator iter = entries.begin(); iter != entries.end(); ++iter) {
+    rgw_bi_log_entry& entry = *iter;
+    encode_json("entry", entry, s->formatter);
+
+    marker = entry.id;
+    flusher.flush();
+  }
+}
+
+void RGWOp_BILog_List::send_response_end() {
+  s->formatter->close_section();
+  flusher.flush();
+}
+      
+void RGWOp_BILog_Delete::execute() {
+  string bucket_name = s->info.args.get("bucket"),
+         start_marker = s->info.args.get("start-marker"),
+         end_marker = s->info.args.get("end-marker");
+  RGWBucketInfo bucket_info;
+
+  http_ret = 0;
+  if (bucket_name.empty() || 
+      start_marker.empty() ||
+      end_marker.empty()) {
+    dout(5) << "ERROR: bucket, start-marker, end-marker are mandatory" << dendl;
+    http_ret = -EINVAL;
+    return;
+  }
+  http_ret = store->get_bucket_info(NULL, bucket_name, bucket_info, NULL);
+  if (http_ret < 0) {
+    dout(5) << "could not get bucket info for bucket=" << bucket_name << dendl;
+    return;
+  }
+  http_ret = store->trim_bi_log_entries(bucket_info.bucket, start_marker, end_marker);
+  if (http_ret < 0) {
+    dout(5) << "ERROR: trim_bi_log_entries() " << dendl;
+  }
+  return;
+}
+
+RGWOp *RGWHandler_Log::op_get() {
+  bool exists;
+  string type = s->info.args.get("type", &exists);
+
+  if (!exists) {
+    return NULL;
+  }
+
+  if (type.compare("metadata") == 0) {
+    if (s->info.args.exists("id")) {
+      return new RGWOp_MDLog_List;
+    } else {
+      return new RGWOp_MDLog_GetShardsInfo;
+    }
+  } else if (type.compare("bucket-index") == 0) {
+    return new RGWOp_BILog_List;
+  }
+  return NULL;
+}
+
+RGWOp *RGWHandler_Log::op_delete() {
+  bool exists;
+  string type = s->info.args.get("type", &exists);
+
+  if (!exists) {
+    return NULL;
+  }
+
+  if (type.compare("metadata") == 0)
+    return new RGWOp_MDLog_Delete;
+  else if (type.compare("bucket-index") == 0) 
+    return new RGWOp_BILog_Delete;
+  return NULL;
+}
+
+RGWOp *RGWHandler_Log::op_post() {
+  bool exists;
+  string type = s->info.args.get("type", &exists);
+
+  if (!exists) {
+    return NULL;
+  }
+
+  if (type.compare("metadata") == 0)
+    return new RGWOp_MDLog_Post;
+  return NULL;
+}
+
diff --git a/src/rgw/rgw_rest_log.h b/src/rgw/rgw_rest_log.h
new file mode 100644
index 00000000000..635758d77cb
--- /dev/null
+++ b/src/rgw/rgw_rest_log.h
@@ -0,0 +1,157 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation. See file COPYING.
+ *
+ */
+#ifndef CEPH_RGW_REST_LOG_H
+#define CEPH_RGW_REST_LOG_H
+
+class RGWOp_BILog_List : public RGWRESTOp {
+  int http_ret;
+  bool sent_header;
+public:
+  RGWOp_BILog_List() : http_ret(0), sent_header(false) {}
+  ~RGWOp_BILog_List() {}
+
+  int check_caps(RGWUserCaps& caps) {
+    return caps.check_cap("bilog", RGW_CAP_READ);
+  }
+  int verify_permission() {
+    return check_caps(s->user.caps);
+  }
+  virtual void send_response();
+  virtual void send_response(list<rgw_bi_log_entry>& entries, string& marker);
+  virtual void send_response_end();
+  void execute();
+  virtual const char *name() {
+    return "list bucket index log";
+  }
+};
+
+class RGWOp_BILog_Delete : public RGWRESTOp {
+public:
+  RGWOp_BILog_Delete() {}
+  ~RGWOp_BILog_Delete() {}
+
+  int check_caps(RGWUserCaps& caps) {
+    return caps.check_cap("bilog", RGW_CAP_WRITE);
+  }
+  void execute();
+  virtual const char *name() {
+    return "trim_bucket_index_log";
+  }
+};
+
+class RGWOp_MDLog_List : public RGWRESTOp {
+  list<cls_log_entry> entries;
+  int http_ret;
+public:
+  RGWOp_MDLog_List() : http_ret(0) {}
+  ~RGWOp_MDLog_List() {}
+
+  int check_caps(RGWUserCaps& caps) {
+    return caps.check_cap("mdlog", RGW_CAP_READ);
+  }
+  int verify_permission() {
+    return check_caps(s->user.caps);
+  }
+  void execute();
+  virtual void send_response();
+  virtual const char *name() {
+    return "list_metadata_log";
+  }
+};
+
+class RGWOp_MDLog_GetShardsInfo : public RGWRESTOp {
+  unsigned num_objects;
+  int http_ret;
+public:
+  RGWOp_MDLog_GetShardsInfo() : num_objects(0), http_ret(0) {}
+  ~RGWOp_MDLog_GetShardsInfo() {}
+
+  int check_caps(RGWUserCaps& caps) {
+    return caps.check_cap("mdlog", RGW_CAP_READ);
+  }
+  int verify_permission() {
+    return check_caps(s->user.caps);
+  }
+  void execute();
+  virtual void send_response();
+  virtual const char *name() {
+    return "get_metadata_log_shards_info";
+  }
+};
+
+class RGWOp_MDLog_Post : public RGWRESTOp {
+  enum {
+    MDLOG_POST_INVALID = 0,
+    MDLOG_POST_LOCK,
+    MDLOG_POST_UNLOCK
+  };
+  int get_post_type() {
+    bool exists;
+    s->info.args.get("lock", &exists);
+    if (exists) 
+      return MDLOG_POST_LOCK;
+    s->info.args.get("unlock", &exists);
+    if (exists)
+      return MDLOG_POST_UNLOCK;
+    return MDLOG_POST_INVALID;
+  }
+public:
+  RGWOp_MDLog_Post() {}
+  ~RGWOp_MDLog_Post() {}
+
+  int check_caps(RGWUserCaps& caps);
+  void execute();
+  virtual const char *name();
+};
+
+class RGWOp_MDLog_Delete : public RGWRESTOp {
+public:
+  RGWOp_MDLog_Delete() {}
+  ~RGWOp_MDLog_Delete() {}
+
+  int check_caps(RGWUserCaps& caps) {
+    return caps.check_cap("mdlog", RGW_CAP_WRITE);
+  }
+  void execute();
+  virtual const char *name() {
+    return "trim_metadata_log";
+  }
+};
+
+class RGWHandler_Log : public RGWHandler_Auth_S3 {
+protected:
+  RGWOp *op_get();
+  RGWOp *op_delete();
+  RGWOp *op_post();
+
+  int read_permissions(RGWOp*) {
+    return 0;
+  }
+public:
+  RGWHandler_Log() : RGWHandler_Auth_S3() {}
+  virtual ~RGWHandler_Log() {}
+};
+
+class RGWRESTMgr_Log : public RGWRESTMgr {
+public:
+  RGWRESTMgr_Log() {}
+  virtual ~RGWRESTMgr_Log() {}
+
+  virtual RGWHandler *get_handler(struct req_state *s){
+    return new RGWHandler_Log;
+  }
+};
+
+#endif
+
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 143ca6ee993..07cd55718fd 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -362,11 +362,11 @@ int RGWCreateBucket_ObjStore_S3::get_params()
 
   policy = s3policy;
 
-  int len;
+  int len = 0;
   char *data;
 #define CREATE_BUCKET_MAX_REQ_LEN (512 * 1024) /* this is way more than enough */
   ret = rgw_rest_read_all_input(s, &data, &len, CREATE_BUCKET_MAX_REQ_LEN);
-  if (ret < 0)
+  if ((ret < 0) && (ret != -ERR_LENGTH_REQUIRED))
     return ret;
 
   bufferptr in_ptr(data, len);
diff --git a/src/test/test_rgw_admin_log.cc b/src/test/test_rgw_admin_log.cc
new file mode 100644
index 00000000000..d3d312b7c5f
--- /dev/null
+++ b/src/test/test_rgw_admin_log.cc
@@ -0,0 +1,1208 @@
+// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
+// vim: ts=8 sw=2 smarttab
+/*
+ * Ceph - scalable distributed file system
+ *
+ * Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
+ *
+ * This is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1, as published by the Free Software
+ * Foundation. See file COPYING.
+ *
+ */
+#include <iostream>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <time.h>
+#include <sys/wait.h>
+#include <unistd.h>
+#include <fstream>
+#include <map>
+#include <list>
+extern "C"{
+#include <curl/curl.h>
+}
+#include "common/ceph_crypto.h"
+#include "include/str_list.h"
+#include "common/ceph_json.h"
+#include "common/code_environment.h"
+#include "common/ceph_argparse.h"
+#include "common/Finisher.h"
+#include "global/global_init.h"
+#include "rgw/rgw_common.h"
+#include "rgw/rgw_rados.h"
+#include "include/utime.h"
+#include "include/object.h"
+#define GTEST
+#ifdef GTEST
+#include <gtest/gtest.h>
+#else
+#define TEST(x, y) void y()
+#define ASSERT_EQ(v, s) if(v != s)cout << "Error at " << __LINE__ << "(" << #v << "!= " << #s << "\n"; \
+                                else cout << "(" << #v << "==" << #s << ") PASSED\n";
+#define EXPECT_EQ(v, s) ASSERT_EQ(v, s)
+#define ASSERT_TRUE(c) if(c)cout << "Error at " << __LINE__ << "(" << #c << ")" << "\n"; \
+                          else cout << "(" << #c << ") PASSED\n";
+#define EXPECT_TRUE(c) ASSERT_TRUE(c) 
+#endif
+using namespace std;
+
+#define CURL_VERBOSE 0
+#define HTTP_RESPONSE_STR "RespCode"
+#define CEPH_CRYPTO_HMACSHA1_DIGESTSIZE 20
+#define RGW_ADMIN_RESP_PATH "/tmp/.test_rgw_admin_resp"
+#define TEST_BUCKET_NAME "test_bucket"
+#define TEST_BUCKET_OBJECT "test_object"
+#define TEST_BUCKET_OBJECT_1 "test_object1"
+#define TEST_BUCKET_OBJECT_SIZE 1024
+
+static string uid = "ceph";
+static string display_name = "CEPH";
+
+extern "C" int ceph_armor(char *dst, const char *dst_end, 
+                          const char *src, const char *end);
+static void print_usage(char *exec){
+  cout << "Usage: " << exec << " <Options>\n";
+  cout << "Options:\n"
+          "-g <gw-ip> - The ip address of the gateway\n"
+          "-p <gw-port> - The port number of the gateway\n"
+          "-c <ceph.conf> - Absolute path of ceph config file\n"
+          "-rgw-admin <path/to/radosgw-admin> - radosgw-admin absolute path\n";
+}
+
+namespace admin_log {
+class test_helper {
+  private:
+    string host;
+    string port;
+    string creds;
+    string rgw_admin_path;
+    string conf_path;
+    CURL *curl_inst;
+    map<string, string> response;
+    list<string> extra_hdrs;
+    string *resp_data;
+    unsigned resp_code;
+  public:
+    test_helper() : resp_data(NULL){
+      curl_global_init(CURL_GLOBAL_ALL);
+    }
+    ~test_helper(){
+      curl_global_cleanup();
+    }
+    int send_request(string method, string uri, 
+                     size_t (*function)(void *,size_t,size_t,void *) = 0,
+                     void *ud = 0, size_t length = 0);
+    int extract_input(int argc, char *argv[]);
+    string& get_response(string hdr){
+      return response[hdr];
+    }
+    void set_extra_header(string hdr){
+      extra_hdrs.push_back(hdr);
+    }
+    void set_response(char *val);
+    void set_response_data(char *data, size_t len){
+      if(resp_data) delete resp_data;
+      resp_data = new string(data, len);
+    }
+    string& get_rgw_admin_path() {
+      return rgw_admin_path;
+    }
+    string& get_ceph_conf_path() {
+      return conf_path;
+    }
+    void set_creds(string& c) {
+      creds = c;
+    }
+    const string *get_response_data(){return resp_data;}
+    unsigned get_resp_code(){return resp_code;}
+};
+
+int test_helper::extract_input(int argc, char *argv[]){
+#define ERR_CHECK_NEXT_PARAM(o) \
+  if((loop + 1) >= argc)return -1; \
+  else o = argv[loop+1];
+
+  for(unsigned loop = 1;loop < (unsigned)argc; loop += 2){
+    if(strcmp(argv[loop], "-g") == 0){
+      ERR_CHECK_NEXT_PARAM(host);
+    }else if(strcmp(argv[loop],"-p") == 0){
+      ERR_CHECK_NEXT_PARAM(port);
+    }else if(strcmp(argv[loop], "-c") == 0){
+      ERR_CHECK_NEXT_PARAM(conf_path);
+    }else if(strcmp(argv[loop], "-rgw-admin") == 0){
+      ERR_CHECK_NEXT_PARAM(rgw_admin_path);
+    }else return -1;
+  }
+  if(host.length() <= 0 ||
+     rgw_admin_path.length() <= 0)
+    return -1;
+  return 0;
+}
+
+void test_helper::set_response(char *r){
+  string sr(r), h, v;
+  unsigned off = sr.find(": ");
+  if(off != string::npos){
+    h.assign(sr, 0, off);
+    v.assign(sr, off + 2, sr.find("\r\n") - (off+2));
+  }else{
+    /*Could be the status code*/
+    if(sr.find("HTTP/") != string::npos){
+      h.assign(HTTP_RESPONSE_STR);
+      off = sr.find(" ");
+      v.assign(sr, off + 1, sr.find("\r\n") - (off + 1));
+      resp_code = atoi((v.substr(0, 3)).c_str());
+    }
+  }
+  response[h] = v;
+}
+
+size_t write_header(void *ptr, size_t size, size_t nmemb, void *ud){
+  test_helper *h = (test_helper *)ud;
+  h->set_response((char *)ptr);
+  return size*nmemb;
+}
+
+size_t write_data(void *ptr, size_t size, size_t nmemb, void *ud){
+  test_helper *h = (test_helper *)ud;
+  h->set_response_data((char *)ptr, size*nmemb);
+  return size*nmemb;
+}
+
+static inline void buf_to_hex(const unsigned char *buf, int len, char *str)
+{
+  int i;
+  str[0] = '\0';
+  for (i = 0; i < len; i++) {
+    sprintf(&str[i*2], "%02x", (int)buf[i]);
+  }
+}
+
+static void calc_hmac_sha1(const char *key, int key_len,
+                    const char *msg, int msg_len, char *dest)
+/* destination should be CEPH_CRYPTO_HMACSHA1_DIGESTSIZE bytes long */
+{
+  ceph::crypto::HMACSHA1 hmac((const unsigned char *)key, key_len);
+  hmac.Update((const unsigned char *)msg, msg_len);
+  hmac.Final((unsigned char *)dest);
+  
+  char hex_str[(CEPH_CRYPTO_HMACSHA1_DIGESTSIZE * 2) + 1];
+  admin_log::buf_to_hex((unsigned char *)dest, CEPH_CRYPTO_HMACSHA1_DIGESTSIZE, hex_str);
+}
+
+static int get_s3_auth(string method, string creds, string date, string res, string& out){
+  string aid, secret, auth_hdr;
+  string tmp_res;
+  unsigned off = creds.find(":");
+  out = "";
+  if(off != string::npos){
+    aid.assign(creds, 0, off);
+    secret.assign(creds, off + 1, string::npos);
+
+    /*sprintf(auth_hdr, "%s\n\n\n%s\n%s", req_type, date, res);*/
+    char hmac_sha1[CEPH_CRYPTO_HMACSHA1_DIGESTSIZE];
+    char b64[65]; /* 64 is really enough */
+    unsigned off = res.find("?");
+    if(off == string::npos)
+      tmp_res = res;
+    else
+      tmp_res.assign(res, 0, off);
+    auth_hdr.append(method + string("\n\n\n") + date + string("\n") + tmp_res);
+    admin_log::calc_hmac_sha1(secret.c_str(), secret.length(), 
+                               auth_hdr.c_str(), auth_hdr.length(), hmac_sha1);
+    int ret = ceph_armor(b64, b64 + 64, hmac_sha1,
+                         hmac_sha1 + CEPH_CRYPTO_HMACSHA1_DIGESTSIZE);
+    if (ret < 0) {
+      cout << "ceph_armor failed\n";
+      return -1;
+    }
+    b64[ret] = 0;
+    out.append(aid + string(":") + b64);
+  }else return -1;
+  return 0;
+}
+
+void get_date(string& d){
+  struct timeval tv;
+  char date[64];
+  struct tm tm;
+  char *days[] = {(char *)"Sun", (char *)"Mon", (char *)"Tue",
+                  (char *)"Wed", (char *)"Thu", (char *)"Fri", 
+                  (char *)"Sat"};
+  char *months[] = {(char *)"Jan", (char *)"Feb", (char *)"Mar", 
+                    (char *)"Apr", (char *)"May", (char *)"Jun",
+                    (char *)"Jul",(char *) "Aug", (char *)"Sep", 
+                    (char *)"Oct", (char *)"Nov", (char *)"Dec"};
+  gettimeofday(&tv, NULL);
+  gmtime_r(&tv.tv_sec, &tm);
+  sprintf(date, "%s, %d %s %d %d:%d:%d GMT", 
+          days[tm.tm_wday], 
+          tm.tm_mday, months[tm.tm_mon], 
+          tm.tm_year + 1900,
+          tm.tm_hour, tm.tm_min, 0 /*tm.tm_sec*/);
+  d = date;
+}
+
+int test_helper::send_request(string method, string res, 
+                                   size_t (*read_function)( void *,size_t,size_t,void *),
+                                   void *ud,
+                                   size_t length){
+  string url;
+  string auth, date;
+  url.append(string("http://") + host);
+  if(port.length() > 0)url.append(string(":") + port);
+  url.append(res);
+  curl_inst = curl_easy_init();
+  if(curl_inst){
+    curl_easy_setopt(curl_inst, CURLOPT_URL, url.c_str());
+    curl_easy_setopt(curl_inst, CURLOPT_CUSTOMREQUEST, method.c_str());
+    curl_easy_setopt(curl_inst, CURLOPT_VERBOSE, CURL_VERBOSE);
+    curl_easy_setopt(curl_inst, CURLOPT_HEADERFUNCTION, admin_log::write_header);
+    curl_easy_setopt(curl_inst, CURLOPT_WRITEHEADER, (void *)this);
+    curl_easy_setopt(curl_inst, CURLOPT_WRITEFUNCTION, admin_log::write_data);
+    curl_easy_setopt(curl_inst, CURLOPT_WRITEDATA, (void *)this);
+    if(read_function){
+      curl_easy_setopt(curl_inst, CURLOPT_READFUNCTION, read_function);
+      curl_easy_setopt(curl_inst, CURLOPT_READDATA, (void *)ud);
+      curl_easy_setopt(curl_inst, CURLOPT_UPLOAD, 1L);
+      curl_easy_setopt(curl_inst, CURLOPT_INFILESIZE_LARGE, (curl_off_t)length);
+    }
+
+    get_date(date);
+    string http_date;
+    http_date.append(string("Date: ") + date);
+
+    string s3auth;
+    if (admin_log::get_s3_auth(method, creds, date, res, s3auth) < 0)
+      return -1;
+    auth.append(string("Authorization: AWS ") + s3auth);
+
+    struct curl_slist *slist = NULL;
+    slist = curl_slist_append(slist, auth.c_str());
+    slist = curl_slist_append(slist, http_date.c_str());
+    for(list<string>::iterator it = extra_hdrs.begin();
+        it != extra_hdrs.end(); it++){
+      slist = curl_slist_append(slist, (*it).c_str());
+    }
+    if(read_function)
+      curl_slist_append(slist, "Expect:");
+    curl_easy_setopt(curl_inst, CURLOPT_HTTPHEADER, slist); 
+
+    response.erase(response.begin(), response.end());
+    extra_hdrs.erase(extra_hdrs.begin(), extra_hdrs.end());
+    CURLcode res = curl_easy_perform(curl_inst);
+    if(res != CURLE_OK){
+      cout << "Curl perform failed for " << url << ", res: " << 
+        curl_easy_strerror(res) << "\n";
+      return -1;
+    }
+    curl_slist_free_all(slist);
+  }
+  curl_easy_cleanup(curl_inst);
+  return 0;
+}
+};
+
+admin_log::test_helper *g_test;
+Finisher *finisher;
+
+int run_rgw_admin(string& cmd, string& resp) {
+  pid_t pid;
+  pid = fork();
+  if (pid == 0) {
+    /* child */
+    list<string> l;
+    get_str_list(cmd, " \t", l);
+    char *argv[l.size()];
+    unsigned loop = 1;
+
+    argv[0] = (char *)"radosgw-admin";
+    for (list<string>::iterator it = l.begin(); 
+         it != l.end(); it++) {
+      argv[loop++] = (char *)(*it).c_str();
+    }
+    argv[loop] = NULL;
+    close(1);
+    stdout = fopen(RGW_ADMIN_RESP_PATH, "w+");
+    if (!stdout) {
+      cout << "Unable to open stdout file" << std::endl;
+    }
+    execv((g_test->get_rgw_admin_path()).c_str(), argv); 
+  } else if (pid > 0) {
+    int status;
+    waitpid(pid, &status, 0);
+    if (WIFEXITED(status)) {
+      if(WEXITSTATUS(status) != 0) {
+        cout << "Child exited with status " << WEXITSTATUS(status) << std::endl;
+        return -1;
+      }
+    }
+    ifstream in;
+    struct stat st;
+
+    if (stat(RGW_ADMIN_RESP_PATH, &st) < 0) {
+      cout << "Error stating the admin response file, errno " << errno << std::endl;
+      return -1;
+    } else {
+      char *data = (char *)malloc(st.st_size + 1);
+      in.open(RGW_ADMIN_RESP_PATH);
+      in.read(data, st.st_size);
+      in.close();
+      data[st.st_size] = 0;
+      resp = data;
+      free(data);
+      unlink(RGW_ADMIN_RESP_PATH);
+      /* cout << "radosgw-admin " << cmd << ": " << resp << std::endl; */
+    }
+  } else 
+    return -1;
+  return 0;
+}
+
+int get_creds(string& json, string& creds) {
+  JSONParser parser;
+  if(!parser.parse(json.c_str(), json.length())) {
+    cout << "Error parsing create user response" << std::endl;
+    return -1;
+  }
+
+  RGWUserInfo info;
+  decode_json_obj(info, &parser);
+  creds = "";
+  for(map<string, RGWAccessKey>::iterator it = info.access_keys.begin();
+      it != info.access_keys.end(); it++) {
+    RGWAccessKey _k = it->second;
+    /*cout << "accesskeys [ " << it->first << " ] = " << 
+      "{ " << _k.id << ", " << _k.key << ", " << _k.subuser << "}" << std::endl;*/
+    creds.append(it->first + string(":") + _k.key);
+    break;
+  }
+  return 0;
+}
+
+int user_create(string& uid, string& display_name, bool set_creds = true) {
+  stringstream ss;
+  string creds;
+  ss << "-c " << g_test->get_ceph_conf_path() << " user create --uid=" << uid
+    << " --display-name=" << display_name;
+
+  string out;
+  string cmd = ss.str();
+  if(run_rgw_admin(cmd, out) != 0) {
+    cout << "Error creating user" << std::endl;
+    return -1;
+  }
+  get_creds(out, creds);
+  if(set_creds)
+    g_test->set_creds(creds);
+  return 0;
+}
+
+int user_info(string& uid, string& display_name, RGWUserInfo& uinfo) {
+  stringstream ss;
+  string creds;
+  ss << "-c " << g_test->get_ceph_conf_path() << " user info --uid=" << uid
+    << " --display-name=" << display_name;
+
+  string out;
+  string cmd = ss.str();
+  if(run_rgw_admin(cmd, out) != 0) {
+    cout << "Error reading user information" << std::endl;
+    return -1;
+  }
+  JSONParser parser;
+  if(!parser.parse(out.c_str(), out.length())) {
+    cout << "Error parsing create user response" << std::endl;
+    return -1;
+  }
+  decode_json_obj(uinfo, &parser);
+  return 0;
+}
+
+int user_rm(string& uid, string& display_name) {
+  stringstream ss;
+  string creds;
+  ss << "-c " << g_test->get_ceph_conf_path() << 
+    " metadata rm --metadata-key=user:" << uid;
+
+  string out;
+  string cmd = ss.str();
+  if(run_rgw_admin(cmd, out) != 0) {
+    cout << "Error removing user" << std::endl;
+    return -1;
+  }
+  return 0;
+}
+
+int caps_add(const char * name, const char *perm) {
+  stringstream ss;
+
+  ss << "-c " << g_test->get_ceph_conf_path() << " caps add --caps=" <<
+     name << "=" << perm << " --uid=" << uid;
+  string out;
+  string cmd = ss.str();
+  if(run_rgw_admin(cmd, out) != 0) {
+    cout << "Error creating user" << std::endl;
+    return -1;
+  }
+  return 0;
+}
+
+int caps_rm(const char * name, const char *perm) {
+  stringstream ss;
+
+  ss << "-c " << g_test->get_ceph_conf_path() << " caps rm --caps=" <<
+     name << "=" << perm << " --uid=" << uid;
+  string out;
+  string cmd = ss.str();
+  if(run_rgw_admin(cmd, out) != 0) {
+    cout << "Error creating user" << std::endl;
+    return -1;
+  }
+  return 0;
+}
+
+static int create_bucket(void){
+  g_test->send_request(string("PUT"), string("/"TEST_BUCKET_NAME));
+  if(g_test->get_resp_code() != 200U){
+    cout << "Error creating bucket, http code " << g_test->get_resp_code();
+    return -1;
+  }
+  return 0;
+}
+
+static int delete_bucket(void){
+  g_test->send_request(string("DELETE"), string("/"TEST_BUCKET_NAME));
+  if(g_test->get_resp_code() != 204U){
+    cout << "Error deleting bucket, http code " << g_test->get_resp_code();
+    return -1;
+  }
+  return 0;
+}
+
+size_t read_dummy_post(void *ptr, size_t s, size_t n, void *ud) {
+  int dummy = 0;
+  memcpy(ptr, &dummy, sizeof(dummy));
+  return sizeof(dummy);
+}
+
+size_t read_bucket_object(void *ptr, size_t s, size_t n, void *ud) {
+  memcpy(ptr, ud, TEST_BUCKET_OBJECT_SIZE);
+  return TEST_BUCKET_OBJECT_SIZE;
+}
+
+static int put_bucket_obj(const char *obj_name, char *data, unsigned len) {
+  string req = "/"TEST_BUCKET_NAME"/";
+  req.append(obj_name);
+  g_test->send_request(string("PUT"), req,
+                       read_bucket_object, (void *)data, (size_t)len);
+  if (g_test->get_resp_code() != 200U) {
+    cout << "Errror sending object to the bucket, http_code " << g_test->get_resp_code();
+    return -1;
+  }
+  return 0;
+}
+
+static int read_bucket_obj(const char *obj_name) {
+  string req = "/"TEST_BUCKET_NAME"/";
+  req.append(obj_name);
+  g_test->send_request(string("GET"), req);
+  if (g_test->get_resp_code() != 200U) {
+    cout << "Errror sending object to the bucket, http_code " << g_test->get_resp_code();
+    return -1;
+  }
+  return 0;
+}
+
+static int delete_obj(const char *obj_name) {
+  string req = "/"TEST_BUCKET_NAME"/";
+  req.append(obj_name);
+  g_test->send_request(string("DELETE"), req);
+  if (g_test->get_resp_code() != 204U) {
+    cout << "Errror deleting object from bucket, http_code " << g_test->get_resp_code();
+    return -1;
+  }
+  return 0;
+}
+
+int get_formatted_time(string& ret) {
+  struct tm *tm = NULL;
+  char str_time[200];
+  const char *format = "%Y-%m-%d%%20%H:%M:%S";
+  time_t t;
+
+  t = time(NULL);
+  tm = gmtime(&t);
+  if(!tm) {
+    cerr << "Error returned by gmtime\n";
+    return -1;
+  }
+  if (strftime(str_time, sizeof(str_time), format, tm) == 0) {
+    cerr << "Error returned by strftime\n";
+    return -1;
+  }
+  ret = str_time;
+  return 0;
+}
+
+int parse_json_resp(JSONParser &parser) {
+  string *resp;
+  resp = (string *)g_test->get_response_data();
+  if(!resp)
+    return -1;
+  if(!parser.parse(resp->c_str(), resp->length())) {
+    cout << "Error parsing create user response" << std::endl;
+    return -1;
+  }
+  return 0;
+}
+
+struct RGWMetadataLogData {
+  obj_version read_version;
+  obj_version write_version;
+  string status;
+};
+
+struct cls_log_entry_json {
+  string section;
+  string name;
+  utime_t timestamp;
+  RGWMetadataLogData log_data;
+};
+
+static int decode_json(JSONObj *obj, RGWMetadataLogData &data) {
+  JSONObj *jo;
+
+  jo = obj->find_obj("read_version");
+  if (!jo)
+    return -1;
+  data.read_version.decode_json(obj);
+  data.write_version.decode_json(obj);
+
+  jo = obj->find_obj("status");
+  if (!jo)
+    return -1;
+  JSONDecoder::decode_json("status", data.status, jo);
+  return 0;
+}
+
+static int decode_json(JSONObj *obj, cls_log_entry_json& ret) {
+  JSONDecoder::decode_json("section", ret.section, obj);
+  JSONDecoder::decode_json("name", ret.name, obj);
+  JSONObj *jo = obj->find_obj("data");
+  if(!jo) 
+    return 0;
+  return decode_json(jo, ret.log_data);
+}
+
+static int get_log_list(list<cls_log_entry_json> &entries) {
+  JSONParser parser;
+  if (parse_json_resp(parser) != 0)
+    return -1;
+  if (!parser.is_array()) 
+    return -1;
+
+  vector<string> l;
+  l = parser.get_array_elements();
+  int loop = 0;
+  for(vector<string>::iterator it = l.begin();
+      it != l.end(); it++, loop++) {
+    JSONParser jp;
+    cls_log_entry_json entry;
+
+    if(!jp.parse((*it).c_str(), (*it).length())) {
+      cerr << "Error parsing log json object" << std::endl;
+      return -1;
+    }
+    EXPECT_EQ(decode_json((JSONObj *)&jp, entry), 0);
+    entries.push_back(entry);
+  }
+  return 0;
+}
+
+struct cls_bilog_entry {
+  string op_id;
+  string op_tag;
+  string op;
+  string object;
+  string status;
+  unsigned index_ver;
+};
+
+static int decode_json(JSONObj *obj, cls_bilog_entry& ret) {
+  JSONDecoder::decode_json("op_id", ret.op_id, obj);
+  JSONDecoder::decode_json("op_tag", ret.op_tag, obj);
+  JSONDecoder::decode_json("op", ret.op, obj);
+  JSONDecoder::decode_json("object", ret.object, obj);
+  JSONDecoder::decode_json("state", ret.status, obj);
+  JSONDecoder::decode_json("index_ver", ret.index_ver, obj);
+  return 0;
+}
+
+static int get_bilog_list(list<cls_bilog_entry> &entries) {
+  JSONParser parser;
+  if (parse_json_resp(parser) != 0)
+    return -1;
+  if (!parser.is_array()) 
+    return -1;
+
+  vector<string> l;
+  l = parser.get_array_elements();
+  int loop = 0;
+  for(vector<string>::iterator it = l.begin();
+      it != l.end(); it++, loop++) {
+    JSONParser jp;
+    cls_bilog_entry entry;
+
+    if(!jp.parse((*it).c_str(), (*it).length())) {
+      cerr << "Error parsing log json object" << std::endl;
+      return -1;
+    }
+    EXPECT_EQ(decode_json((JSONObj *)&jp, entry), 0);
+    entries.push_back(entry);
+  }
+  return 0;
+}
+
+unsigned get_shard_id(string& key, int max_shards) {
+  string section = "user";
+  uint32_t val = ceph_str_hash_linux(key.c_str(), key.size());
+  val ^= ceph_str_hash_linux(section.c_str(), section.size());
+  return (unsigned)(val % max_shards);
+}
+
+TEST(TestRGWAdmin, mdlog_list) {
+  string start_time, 
+         end_time,
+         start_time_2;
+  const char *cname = "mdlog",
+             *perm = "*";
+  string rest_req;
+  unsigned shard_id = get_shard_id(uid, g_ceph_context->_conf->rgw_md_log_max_shards);
+  stringstream ss;
+
+  ASSERT_EQ(get_formatted_time(start_time), 0);
+  ASSERT_EQ(0, user_create(uid, display_name));
+  ASSERT_EQ(0, caps_add(cname, perm));
+
+  rest_req = "/admin/log?type=metadata";
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  JSONParser parser;
+  int num_objects;
+  EXPECT_EQ (parse_json_resp(parser), 0);
+  JSONDecoder::decode_json("num_objects", num_objects, (JSONObj *)&parser);
+  ASSERT_EQ(num_objects,g_ceph_context->_conf->rgw_md_log_max_shards);
+
+  ss.str("");
+  ss << "/admin/log?type=metadata&id=" << shard_id << "&start-time=" << start_time;
+  rest_req = ss.str();
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  
+  list<cls_log_entry_json> entries;
+  EXPECT_EQ(get_log_list(entries), 0);
+  EXPECT_EQ(entries.size(), 4U);
+
+  if(entries.size() == 4) {
+    list<cls_log_entry_json>::iterator it = entries.begin();
+    EXPECT_TRUE(it->section.compare("user") == 0);
+    EXPECT_TRUE(it->name.compare(uid) == 0);
+    EXPECT_TRUE(it->log_data.status.compare("write") == 0);
+    it++;
+    EXPECT_TRUE(it->section.compare("user") == 0);
+    EXPECT_TRUE(it->name.compare(uid) == 0);
+    EXPECT_TRUE(it->log_data.status.compare("complete") == 0);
+    it++;
+    EXPECT_TRUE(it->section.compare("user") == 0);
+    EXPECT_TRUE(it->name.compare(uid) == 0);
+    EXPECT_TRUE(it->log_data.status.compare("write") == 0);
+    it++;
+    EXPECT_TRUE(it->section.compare("user") == 0);
+    EXPECT_TRUE(it->name.compare(uid) == 0);
+    EXPECT_TRUE(it->log_data.status.compare("complete") == 0);
+  }
+
+  sleep(1); /*To get a modified time*/
+  ASSERT_EQ(get_formatted_time(start_time_2), 0);
+  ASSERT_EQ(0, caps_rm(cname, perm));
+  perm="read";
+  ASSERT_EQ(0, caps_add(cname, perm));
+  ss.str("");
+  ss << "/admin/log?type=metadata&id=" << shard_id << "&start-time=" << start_time_2;
+  rest_req = ss.str();
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+ 
+  entries.clear();
+  EXPECT_EQ(get_log_list(entries), 0);
+  EXPECT_EQ(entries.size(), 4U);
+
+  if(entries.size() == 4) {
+    list<cls_log_entry_json>::iterator it = entries.begin();
+    EXPECT_TRUE(it->section.compare("user") == 0);
+    EXPECT_TRUE(it->name.compare(uid) == 0);
+    EXPECT_TRUE(it->log_data.status.compare("write") == 0);
+    it++;
+    EXPECT_TRUE(it->section.compare("user") == 0);
+    EXPECT_TRUE(it->name.compare(uid) == 0);
+    EXPECT_TRUE(it->log_data.status.compare("complete") == 0);
+    it++;
+    EXPECT_TRUE(it->section.compare("user") == 0);
+    EXPECT_TRUE(it->name.compare(uid) == 0);
+    EXPECT_TRUE(it->log_data.status.compare("write") == 0);
+    it++;
+    EXPECT_TRUE(it->section.compare("user") == 0);
+    EXPECT_TRUE(it->name.compare(uid) == 0);
+    EXPECT_TRUE(it->log_data.status.compare("complete") == 0);
+  }
+
+  sleep(1);
+  ASSERT_EQ(get_formatted_time(start_time_2), 0);
+  ASSERT_EQ(0, user_rm(uid, display_name));
+  
+  ASSERT_EQ(0, user_create(uid, display_name));
+  perm = "*";
+  ASSERT_EQ(0, caps_add(cname, perm));
+
+  ss.str("");
+  ss << "/admin/log?type=metadata&id=" << shard_id << "&start-time=" << start_time_2;
+  rest_req = ss.str();
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  
+  entries.clear();
+  EXPECT_EQ(get_log_list(entries), 0);
+  EXPECT_EQ(entries.size(), 6U);
+  if(entries.size() == 6) {
+    list<cls_log_entry_json>::iterator it = entries.begin();
+    EXPECT_TRUE(it->section.compare("user") == 0);
+    EXPECT_TRUE(it->name.compare(uid) == 0);
+    EXPECT_TRUE(it->log_data.status.compare("remove") == 0);
+    it++;
+    EXPECT_TRUE(it->section.compare("user") == 0);
+    EXPECT_TRUE(it->name.compare(uid) == 0);
+    it++;
+    EXPECT_TRUE(it->section.compare("user") == 0);
+    EXPECT_TRUE(it->name.compare(uid) == 0);
+    EXPECT_TRUE(it->log_data.status.compare("write") == 0);
+    it++;
+    EXPECT_TRUE(it->section.compare("user") == 0);
+    EXPECT_TRUE(it->name.compare(uid) == 0);
+    EXPECT_TRUE(it->log_data.status.compare("complete") == 0);
+  }
+
+  sleep(1);
+  ASSERT_EQ(get_formatted_time(end_time), 0);
+  ss.str("");
+  ss << "/admin/log?type=metadata&id=" << shard_id << "&start-time=" << start_time 
+    << "&end-time=" << end_time;
+  rest_req = ss.str();
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  entries.clear();
+  EXPECT_EQ(get_log_list(entries), 0);
+  EXPECT_EQ(entries.size(), 14U);
+
+
+  ASSERT_EQ(0, caps_rm(cname, perm));
+  ss.str("");
+  ss << "/admin/log?type=metadata&id=" << shard_id << "&start-time=" << start_time;
+  rest_req = ss.str();
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(403U, g_test->get_resp_code());
+
+  /*cleanup*/
+  ASSERT_EQ(0, caps_add(cname, perm));
+  sleep(1);
+  ASSERT_EQ(get_formatted_time(end_time), 0);
+  ss.str("");
+  ss << "/admin/log?type=metadata&id=" << shard_id << "&start-time=" << start_time 
+    << "&end-time=" << end_time;
+  rest_req = ss.str();
+  g_test->send_request(string("DELETE"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+
+  ASSERT_EQ(0, user_rm(uid, display_name));
+}
+
+TEST(TestRGWAdmin, mdlog_trim) {
+  string start_time, 
+         end_time,
+         start_time_2;
+  const char *cname = "mdlog",
+             *perm = "*";
+  string rest_req;
+  list<cls_log_entry_json> entries;
+  unsigned shard_id = get_shard_id(uid, g_ceph_context->_conf->rgw_md_log_max_shards);
+  ostringstream ss;
+
+  sleep(1);
+  ASSERT_EQ(get_formatted_time(start_time), 0);
+  ASSERT_EQ(0, user_create(uid, display_name));
+  ASSERT_EQ(0, caps_add(cname, perm));
+
+  ss.str("");
+  ss << "/admin/log?type=metadata&id=" << shard_id << "&start-time=" << start_time;
+  rest_req = ss.str();
+  g_test->send_request(string("DELETE"), rest_req);
+  EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/
+
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  EXPECT_EQ(get_log_list(entries), 0);
+  EXPECT_EQ(entries.size(), 4U);
+
+  sleep(1);
+  ASSERT_EQ(get_formatted_time(end_time), 0);
+  ss.str("");
+  ss << "/admin/log?type=metadata&id=" << shard_id << "&start-time=" << start_time << "&end-time=" << end_time;
+  rest_req = ss.str();
+  g_test->send_request(string("DELETE"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+
+  ss.str("");
+  ss << "/admin/log?type=metadata&id=" << shard_id << "&start-time=" << start_time;
+  rest_req = ss.str();
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  entries.clear();
+  EXPECT_EQ(get_log_list(entries), 0);
+  EXPECT_EQ(entries.size(), 0U);
+
+  ASSERT_EQ(0, caps_rm(cname, perm));
+  perm="write";
+  ASSERT_EQ(0, caps_add(cname, perm));
+  ASSERT_EQ(get_formatted_time(end_time), 0);
+  ss.str("");
+  ss << "/admin/log?type=metadata&id=" << shard_id << "&start-time=" << start_time << "&end-time=" << end_time;
+  rest_req = ss.str();
+  g_test->send_request(string("DELETE"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+
+  ASSERT_EQ(0, caps_rm(cname, perm));
+  g_test->send_request(string("DELETE"), rest_req);
+  EXPECT_EQ(403U, g_test->get_resp_code());
+  ASSERT_EQ(0, user_rm(uid, display_name));
+}
+
+TEST(TestRGWAdmin, mdlog_lock_unlock) {
+  const char *cname = "mdlog",
+             *perm = "*";
+  string rest_req;
+
+  ASSERT_EQ(0, user_create(uid, display_name));
+  ASSERT_EQ(0, caps_add(cname, perm));
+
+  rest_req = "/admin/log?type=metadata&lock&length=3&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/
+  
+  rest_req = "/admin/log?type=metadata&lock&id=3&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/
+  
+  rest_req = "/admin/log?type=metadata&lock&length=3&id=1";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/
+
+  rest_req = "/admin/log?type=metadata&unlock&id=1";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/
+
+  rest_req = "/admin/log?type=metadata&unlock&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/
+  
+  rest_req = "/admin/log?type=metadata&lock&id=1&length=3&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(200U, g_test->get_resp_code()); 
+  
+  rest_req = "/admin/log?type=metadata&unlock&id=1&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(200U, g_test->get_resp_code()); 
+  
+  rest_req = "/admin/log?type=metadata&lock&id=1&length=3&lock_id=ceph1";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(200U, g_test->get_resp_code()); 
+  
+  rest_req = "/admin/log?type=metadata&unlock&id=1&lock_id=ceph1";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(200U, g_test->get_resp_code()); 
+  
+  rest_req = "/admin/log?type=metadata&lock&id=1&length=3&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(200U, g_test->get_resp_code()); 
+  utime_t sleep_time(3, 0);
+
+  rest_req = "/admin/log?type=metadata&lock&id=1&length=3&lock_id=ceph1";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(500U, g_test->get_resp_code()); 
+
+  rest_req = "/admin/log?type=metadata&lock&id=1&length=3&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(409U, g_test->get_resp_code()); 
+  sleep_time.sleep();
+
+  rest_req = "/admin/log?type=metadata&lock&id=1&length=3&lock_id=ceph1";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(200U, g_test->get_resp_code()); 
+  
+  rest_req = "/admin/log?type=metadata&unlock&id=1&lock_id=ceph1";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(200U, g_test->get_resp_code()); 
+
+  ASSERT_EQ(0, caps_rm(cname, perm));
+  perm = "read";
+  ASSERT_EQ(0, caps_add(cname, perm));
+  rest_req = "/admin/log?type=metadata&lock&id=1&length=3&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(200U, g_test->get_resp_code()); 
+  
+  rest_req = "/admin/log?type=metadata&unlock&id=1&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(200U, g_test->get_resp_code()); 
+  
+  ASSERT_EQ(0, caps_rm(cname, perm));
+  perm = "write";
+  ASSERT_EQ(0, caps_add(cname, perm));
+  rest_req = "/admin/log?type=metadata&lock&id=1&length=3&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(200U, g_test->get_resp_code()); 
+  
+  rest_req = "/admin/log?type=metadata&unlock&id=1&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(200U, g_test->get_resp_code()); 
+  
+  ASSERT_EQ(0, caps_rm(cname, perm));
+  rest_req = "/admin/log?type=metadata&lock&id=1&length=3&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(403U, g_test->get_resp_code()); 
+  
+  rest_req = "/admin/log?type=metadata&unlock&id=1&lock_id=ceph";
+  g_test->send_request(string("POST"), rest_req, read_dummy_post, NULL, sizeof(int));
+  EXPECT_EQ(403U, g_test->get_resp_code()); 
+  
+  ASSERT_EQ(0, user_rm(uid, display_name));
+}
+
+TEST(TestRGWAdmin, bilog_list) {
+  const char *cname = "bilog",
+             *perm = "*";
+  string rest_req;
+
+  ASSERT_EQ(0, user_create(uid, display_name));
+  ASSERT_EQ(0, caps_add(cname, perm));
+
+  ASSERT_EQ(0, create_bucket());
+
+  char *bucket_obj = (char *)malloc(TEST_BUCKET_OBJECT_SIZE);
+  ASSERT_TRUE(bucket_obj != NULL);
+  EXPECT_EQ(put_bucket_obj(TEST_BUCKET_OBJECT, bucket_obj, TEST_BUCKET_OBJECT_SIZE), 0);
+  free(bucket_obj);
+  
+  rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME;
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  list<cls_bilog_entry> entries;
+  get_bilog_list(entries);
+  EXPECT_EQ(2U, entries.size());
+  if (entries.size() == 2) {
+    list<cls_bilog_entry>::iterator it = entries.begin();
+    EXPECT_EQ(it->op.compare("write"), 0);
+    EXPECT_EQ(it->object.compare(TEST_BUCKET_OBJECT), 0);
+    EXPECT_EQ(it->status.compare("pending"), 0);
+    EXPECT_EQ(it->index_ver, 1U);
+    it++;
+    EXPECT_EQ(it->op.compare("write"), 0);
+    EXPECT_EQ(it->object.compare(TEST_BUCKET_OBJECT), 0);
+    EXPECT_EQ(it->status.compare("complete"), 0);
+    EXPECT_EQ(it->index_ver, 2U);
+  }
+  EXPECT_EQ(read_bucket_obj(TEST_BUCKET_OBJECT), 0);
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  entries.clear();
+  get_bilog_list(entries);
+  EXPECT_EQ(2U, entries.size());
+
+  bucket_obj = (char *)malloc(TEST_BUCKET_OBJECT_SIZE);
+  ASSERT_TRUE(bucket_obj != NULL);
+  EXPECT_EQ(put_bucket_obj(TEST_BUCKET_OBJECT_1, bucket_obj, TEST_BUCKET_OBJECT_SIZE), 0);
+  free(bucket_obj);
+  
+  rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME;
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  entries.clear();
+  get_bilog_list(entries);
+  EXPECT_EQ(4U, entries.size());
+  if (entries.size() == 4) {
+    list<cls_bilog_entry>::iterator it = entries.begin();
+
+    it++; it++;
+    EXPECT_EQ(it->op.compare("write"), 0);
+    EXPECT_EQ(it->object.compare(TEST_BUCKET_OBJECT_1), 0);
+    EXPECT_EQ(it->status.compare("pending"), 0);
+    EXPECT_EQ(it->index_ver, 3U);
+    it++;
+    EXPECT_EQ(it->op.compare("write"), 0);
+    EXPECT_EQ(it->object.compare(TEST_BUCKET_OBJECT_1), 0);
+    EXPECT_EQ(it->status.compare("complete"), 0);
+    EXPECT_EQ(it->index_ver, 4U);
+  }
+
+  ASSERT_EQ(0, delete_obj(TEST_BUCKET_OBJECT));
+  rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME;
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  entries.clear();
+  get_bilog_list(entries);
+
+  EXPECT_EQ(6U, entries.size());
+  string marker;
+  if (entries.size() == 6) {
+    list<cls_bilog_entry>::iterator it = entries.begin();
+    
+    it++; it++; it++; it++;
+    marker = it->op_id;
+    EXPECT_EQ(it->op.compare("del"), 0);
+    EXPECT_EQ(it->object.compare(TEST_BUCKET_OBJECT), 0);
+    EXPECT_EQ(it->status.compare("pending"), 0);
+    EXPECT_EQ(it->index_ver, 5U);
+    it++;
+    EXPECT_EQ(it->op.compare("del"), 0);
+    EXPECT_EQ(it->object.compare(TEST_BUCKET_OBJECT), 0);
+    EXPECT_EQ(it->status.compare("complete"), 0);
+    EXPECT_EQ(it->index_ver, 6U);
+  }
+
+  rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME;
+  rest_req.append("&marker=");
+  rest_req.append(marker);
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  entries.clear();
+  get_bilog_list(entries);
+  EXPECT_EQ(2U, entries.size());
+  if (entries.size() == 2U) {
+    list<cls_bilog_entry>::iterator it = entries.begin();
+    EXPECT_EQ(it->index_ver, 5U);
+    it++;
+    EXPECT_EQ(it->index_ver, 6U);
+    EXPECT_EQ(it->op.compare("del"), 0);
+  }
+
+  rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME;
+  rest_req.append("&marker=");
+  rest_req.append(marker);
+  rest_req.append("&max-entries=1");
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  entries.clear();
+  get_bilog_list(entries);
+  EXPECT_EQ(1U, entries.size());
+  EXPECT_EQ((entries.begin())->index_ver, 5U);
+
+  ASSERT_EQ(0, caps_rm(cname, perm));
+  perm = "read";
+  ASSERT_EQ(0, caps_add(cname, perm));
+  rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME;
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+
+  ASSERT_EQ(0, caps_rm(cname, perm));
+  perm = "write";
+  ASSERT_EQ(0, caps_add(cname, perm));
+  rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME;
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(403U, g_test->get_resp_code());
+
+  ASSERT_EQ(0, delete_obj(TEST_BUCKET_OBJECT_1));
+  ASSERT_EQ(0, delete_bucket());
+  ASSERT_EQ(0, user_rm(uid, display_name));
+}
+
+TEST(TestRGWAdmin, bilog_trim) {
+  const char *cname = "bilog",
+             *perm = "*";
+  string rest_req, start_marker, end_marker;
+
+  ASSERT_EQ(0, user_create(uid, display_name));
+  ASSERT_EQ(0, caps_add(cname, perm));
+
+  ASSERT_EQ(0, create_bucket());
+
+  rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME;
+  g_test->send_request(string("DELETE"), rest_req);
+  EXPECT_EQ(400U, g_test->get_resp_code()); /*Bad request*/
+
+  char *bucket_obj = (char *)malloc(TEST_BUCKET_OBJECT_SIZE);
+  ASSERT_TRUE(bucket_obj != NULL);
+  EXPECT_EQ(put_bucket_obj(TEST_BUCKET_OBJECT, bucket_obj, TEST_BUCKET_OBJECT_SIZE), 0);
+  free(bucket_obj);
+  
+  rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME;
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  list<cls_bilog_entry> entries;
+  get_bilog_list(entries);
+  EXPECT_EQ(2U, entries.size());
+
+  list<cls_bilog_entry>::iterator it = entries.begin();
+  start_marker = it->op_id;
+  it++;
+  end_marker = it->op_id;
+
+  rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME;
+  rest_req.append("&start-marker=");
+  rest_req.append(start_marker);
+  rest_req.append("&end-marker=");
+  rest_req.append(end_marker);
+  g_test->send_request(string("DELETE"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+
+  rest_req = "/admin/log?type=bucket-index&bucket="TEST_BUCKET_NAME;
+  g_test->send_request(string("GET"), rest_req);
+  EXPECT_EQ(200U, g_test->get_resp_code());
+  entries.clear();
+  get_bilog_list(entries);
+  EXPECT_EQ(0U, entries.size());
+  
+  ASSERT_EQ(0, delete_obj(TEST_BUCKET_OBJECT));
+  ASSERT_EQ(0, delete_bucket());
+  ASSERT_EQ(0, user_rm(uid, display_name));
+}
+
+int main(int argc, char *argv[]){
+  vector<const char*> args;
+  argv_to_vec(argc, (const char **)argv, args);
+
+  global_init(NULL, args, CEPH_ENTITY_TYPE_CLIENT, CODE_ENVIRONMENT_UTILITY, 0);
+  common_init_finish(g_ceph_context);
+  g_test = new admin_log::test_helper();
+  finisher = new Finisher(g_ceph_context);
+#ifdef GTEST
+  ::testing::InitGoogleTest(&argc, argv);
+#endif
+  finisher->start();
+
+  if(g_test->extract_input(argc, argv) < 0){
+    print_usage(argv[0]);
+    return -1;
+  }
+#ifdef GTEST
+  int r = RUN_ALL_TESTS();
+  if (r >= 0) {
+    cout << "There are no failures in the test case\n";
+  } else {
+    cout << "There are some failures\n";
+  }
+#endif
+  finisher->stop();
+  return 0;
+}