[sheepdog] [PATCH v3 3/3] sheep/http: add lock to protect container and object

[Liu Yuan]

On Wed, Dec 11, 2013 at 06:14:43PM +0800, Robin Dong wrote:
> From: Robin Dong <sanbai at taobao.com>
> 
> Add locks to protect containers and objects when users create/delete
> containers or create/delete objects in the same time.
> 
> Signed-off-by: Robin Dong <sanbai at taobao.com>
> ---
>  sheep/http/kv.c    | 252 ++++++++++++++++++++++++++++++++---------------------
>  sheep/http/swift.c |  10 ++-
>  2 files changed, 162 insertions(+), 100 deletions(-)
> 
> diff --git a/sheep/http/kv.c b/sheep/http/kv.c
> index fb66dfa..4d690cb 100644
> --- a/sheep/http/kv.c
> +++ b/sheep/http/kv.c
> @@ -218,22 +218,22 @@ static int kv_get_account(const char *account, uint32_t *nr_buckets)
>  
>  	ret = lookup_vdi(account, &account_vid);
>  	if (ret != SD_RES_SUCCESS)
> -		return ret;
> +		goto out;
>  
>  	/* read account vdi out */
>  	oid = vid_to_vdi_oid(account_vid);
>  	ret = sd_read_object(oid, (char *)&inode, sizeof(struct sd_inode), 0);
>  	if (ret != SD_RES_SUCCESS) {
>  		sd_err("Failed to read inode header %lx", oid);
> -		return ret;
> +		goto out;
>  	}
>  
>  	struct list_buckets_arg arg = {NULL, NULL, NULL, 0};
>  	traverse_btree(sheep_bnode_reader, &inode, list_buckets_cb, &arg);
>  	if (nr_buckets)
>  		*nr_buckets = arg.bucket_counter;
> -
> -	return SD_RES_SUCCESS;
> +out:
> +	return ret;
>  }
>  
>  int kv_read_account(const char *account, uint32_t *nr_buckets)
> @@ -528,21 +528,22 @@ out:
>  }
>  
>  static int kv_get_bucket(struct sd_inode *account_inode, const char *account,
> -			 const char *bucket)
> +			 const char *bucket, uint32_t *account_vid)
>  {
>  	char vdi_name[SD_MAX_VDI_LEN];
>  	uint64_t oid;
> -	uint32_t account_vid, bucket_vid;
> +	uint32_t bucket_vid;
>  	int ret;
>  
> -	ret = lookup_vdi(account, &account_vid);
> +	ret = lookup_vdi(account, account_vid);
>  	if (ret != SD_RES_SUCCESS) {
>  		sd_err("Failed to find account %s", account);
>  		return -1;
>  	}
>  
> +	sys->cdrv->lock(*account_vid);
>  	/* read account vdi out */
> -	oid = vid_to_vdi_oid(account_vid);
> +	oid = vid_to_vdi_oid(*account_vid);
>  	ret = sd_read_object(oid, (char *)account_inode,
>  			  sizeof(struct sd_inode), 0);
>  	if (ret != SD_RES_SUCCESS)
> @@ -559,15 +560,19 @@ int kv_create_bucket(const char *account, const char *bucket)
>  {
>  	struct sd_inode inode;
>  	uint64_t hval, i;
> +	uint32_t account_vid;
>  	int ret;
>  
> -	ret = kv_get_bucket(&inode, account, bucket);
> +	ret = kv_get_bucket(&inode, account, bucket, &account_vid);
>  	/* if bucket is exists, return SD_RES_VDI_EXIST */
>  	if (!ret) {
>  		sd_err("bucket %s is exists.", bucket);
> -		return SD_RES_VDI_EXIST;
> -	} else if (ret < 0)
> -		return -1;
> +		ret = SD_RES_VDI_EXIST;
> +		goto out;
> +	} else if (ret < 0) {
> +		ret = -1;
> +		goto out;
> +	}
>  
>  	sd_debug("read account inode success");
>  
> @@ -581,7 +586,7 @@ int kv_create_bucket(const char *account, const char *bucket)
>  			continue;
>  		} else if (ret < 0) {
>  			sd_err("Failed to add bucket");
> -			return ret;
> +			goto out;
>  		}
>  		/* add bucket success */
>  		sd_debug("add bucket success");
> @@ -590,9 +595,12 @@ int kv_create_bucket(const char *account, const char *bucket)
>  
>  	if (i >= MAX_BUCKETS) {
>  		sd_err("Containers in vdi %s is full!", account);
> -		return -1;
> +		ret = -1;
> +		goto out;
>  	}
> -	return 0;
> +out:
> +	sys->cdrv->unlock(account_vid);
> +	return ret;
>  }
>  
>  int kv_read_bucket(const char *account, const char *bucket)
> @@ -612,12 +620,13 @@ int kv_delete_bucket(const char *account, const char *bucket)
>  {
>  	struct sd_inode inode;
>  	uint64_t hval, i;
> +	uint32_t account_vid;
>  	int ret;
>  
> -	ret = kv_get_bucket(&inode, account, bucket);
> +	ret = kv_get_bucket(&inode, account, bucket, &account_vid);
>  	if (ret) {
>  		sd_err("Failed to get bucket");
> -		return ret;
> +		goto out;
>  	}
>  
>  	hval = sd_hash(bucket, strlen(bucket));
> @@ -629,7 +638,7 @@ int kv_delete_bucket(const char *account, const char *bucket)
>  			continue;
>  		} else if (ret < 0) {
>  			sd_err("Failed to delete bucket %d", ret);
> -			return ret;
> +			goto out;
>  		}
>  		/* delete bucket success */
>  		sd_debug("delete bucket success");
> @@ -638,9 +647,12 @@ int kv_delete_bucket(const char *account, const char *bucket)
>  
>  	if (i >= MAX_BUCKETS) {
>  		sd_err("Can't find bucket %s", bucket);
> -		return SD_RES_NO_VDI;
> +		ret = SD_RES_NO_VDI;
> +		goto out;
>  	}
> -	return SD_RES_SUCCESS;
> +out:
> +	sys->cdrv->unlock(account_vid);
> +	return ret;
>  }
>  
>  int kv_list_buckets(struct http_request *req, const char *account,
> @@ -659,17 +671,20 @@ int kv_list_buckets(struct http_request *req, const char *account,
>  
>  	/* read account vdi out */
>  	oid = vid_to_vdi_oid(account_vid);
> +	sys->cdrv->lock(account_vid);
>  	ret = sd_read_object(oid, (char *)&account_inode,
>  			  sizeof(struct sd_inode), 0);
>  	if (ret != SD_RES_SUCCESS) {
>  		sd_err("Failed to read account inode header %lx", oid);
> -		return ret;
> +		goto out;
>  	}
>  
>  	struct list_buckets_arg arg = {req, opaque, cb, 0};
>  	traverse_btree(sheep_bnode_reader, &account_inode,
>  		       list_buckets_cb, &arg);
> -	return SD_RES_SUCCESS;
> +out:
> +	sys->cdrv->unlock(account_vid);
> +	return ret;
>  }
>  
>  /*
> @@ -867,13 +882,72 @@ out:
>  	return ret;
>  }
>  
> +static int kv_create_extent_onode(struct http_request *req, uint32_t data_vid,
> +				  struct kv_onode *onode, ssize_t *total_size)
> +{
> +	ssize_t size;
> +	uint64_t start = 0, count, limit, block;
> +	int ret;
> +	char *data_buf = NULL;
> +
> +	count = (req->data_length + SD_DATA_OBJ_SIZE + 1) / SD_DATA_OBJ_SIZE;

I guess you mean '-1' here.

use DIV_ROUND_UP to avoid such errors.

Thanks
Yuan