[sheepdog] [PATCH 2/6] object cache: clean up cache for format operation
Liu Yuan
namei.unix at gmail.com
Mon Jan 21 13:32:27 CET 2013
From: Liu Yuan <tailai.ly at taobao.com>
Signed-off-by: Liu Yuan <tailai.ly at taobao.com>
---
sheep/object_cache.c | 44 ++++++++++++++++++++++++++++++--------------
sheep/plain_store.c | 2 ++
sheep/sheep_priv.h | 1 +
3 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/sheep/object_cache.c b/sheep/object_cache.c
index 270cf76..df35182 100644
--- a/sheep/object_cache.c
+++ b/sheep/object_cache.c
@@ -76,7 +76,7 @@ struct object_cache {
};
static struct global_cache sys_cache;
-static char cache_dir[PATH_MAX];
+static char object_cache_dir[PATH_MAX];
static int def_open_flags = O_RDWR;
#define HASH_BITS 5
@@ -204,7 +204,7 @@ static int remove_cache_object(struct object_cache *oc, uint32_t idx)
int ret = SD_RES_SUCCESS;
char path[PATH_MAX];
- sprintf(path, "%s/%06"PRIx32"/%08"PRIx32, cache_dir, oc->vid, idx);
+ sprintf(path, "%s/%06"PRIx32"/%08"PRIx32, object_cache_dir, oc->vid, idx);
dprintf("removing cache object %"PRIx64"\n", idx_to_oid(oc->vid, idx));
if (unlink(path) < 0) {
eprintf("failed to remove cached object %m\n");
@@ -230,7 +230,7 @@ static int read_cache_object_noupdate(uint32_t vid, uint32_t idx, void *buf,
int fd, flags = def_open_flags, ret = SD_RES_SUCCESS;
char p[PATH_MAX];
- sprintf(p, "%s/%06"PRIx32"/%08"PRIx32, cache_dir, vid, idx);
+ sprintf(p, "%s/%06"PRIx32"/%08"PRIx32, object_cache_dir, vid, idx);
if (sys->object_cache_directio && !idx_has_vdi_bit(idx))
flags |= O_DIRECT;
@@ -264,7 +264,7 @@ static int write_cache_object_noupdate(uint32_t vid, uint32_t idx, void *buf,
int fd, flags = def_open_flags, ret = SD_RES_SUCCESS;
char p[PATH_MAX];
- sprintf(p, "%s/%06"PRIx32"/%08"PRIx32, cache_dir, vid, idx);
+ sprintf(p, "%s/%06"PRIx32"/%08"PRIx32, object_cache_dir, vid, idx);
if (sys->object_cache_directio && !idx_has_vdi_bit(idx))
flags |= O_DIRECT;
@@ -490,11 +490,11 @@ static int create_dir_for(uint32_t vid)
int ret = 0;
struct strbuf buf = STRBUF_INIT;
- strbuf_addstr(&buf, cache_dir);
+ strbuf_addstr(&buf, object_cache_dir);
strbuf_addf(&buf, "/%06"PRIx32, vid);
if (mkdir(buf.buf, def_dmode) < 0)
if (errno != EEXIST) {
- eprintf("%m\n");
+ eprintf("%s, %m\n", buf.buf);
ret = -1;
goto err;
}
@@ -606,7 +606,7 @@ static int object_cache_lookup(struct object_cache *oc, uint32_t idx,
unsigned data_length;
char path[PATH_MAX];
- sprintf(path, "%s/%06"PRIx32"/%08"PRIx32, cache_dir, oc->vid, idx);
+ sprintf(path, "%s/%06"PRIx32"/%08"PRIx32, object_cache_dir, oc->vid, idx);
if (!create) {
if (access(path, R_OK | W_OK) < 0) {
if (errno != ENOENT) {
@@ -623,6 +623,7 @@ static int object_cache_lookup(struct object_cache *oc, uint32_t idx,
fd = open(path, flags, def_fmode);
if (fd < 0) {
+ dprintf("%s, %m\n", path);
ret = SD_RES_EIO;
goto out;
}
@@ -651,7 +652,7 @@ static int create_cache_object(struct object_cache *oc, uint32_t idx,
int ret = SD_RES_OID_EXIST;
char path[PATH_MAX], tmp_path[PATH_MAX];
- sprintf(tmp_path, "%s/%06"PRIx32"/%08"PRIx32".tmp", cache_dir,
+ sprintf(tmp_path, "%s/%06"PRIx32"/%08"PRIx32".tmp", object_cache_dir,
oc->vid, idx);
fd = open(tmp_path, flags, def_fmode);
if (fd < 0) {
@@ -681,7 +682,7 @@ static int create_cache_object(struct object_cache *oc, uint32_t idx,
goto out_close;
}
/* This is intended to take care of partial write due to crash */
- sprintf(path, "%s/%06"PRIx32"/%08"PRIx32, cache_dir, oc->vid, idx);
+ sprintf(path, "%s/%06"PRIx32"/%08"PRIx32, object_cache_dir, oc->vid, idx);
ret = link(tmp_path, path);
if (ret < 0) {
if (errno == EEXIST) {
@@ -805,7 +806,7 @@ void object_cache_delete(uint32_t vid)
free(cache);
/* Then we free disk */
- sprintf(path, "%s/%06"PRIx32, cache_dir, vid);
+ sprintf(path, "%s/%06"PRIx32, object_cache_dir, vid);
rmdir_r(path);
}
@@ -842,7 +843,7 @@ static int object_cache_flush_and_delete(struct object_cache *oc)
char p[PATH_MAX];
dprintf("%"PRIx32"\n", vid);
- sprintf(p, "%s/%06"PRIx32, cache_dir, vid);
+ sprintf(p, "%s/%06"PRIx32, object_cache_dir, vid);
dir = opendir(p);
if (!dir) {
dprintf("%m\n");
@@ -1073,7 +1074,7 @@ static int load_existing_cache_object(struct object_cache *cache)
int ret = 0;
strbuf_init(&idx_buf, PATH_MAX);
- strbuf_addstr(&idx_buf, cache_dir);
+ strbuf_addstr(&idx_buf, object_cache_dir);
strbuf_addf(&idx_buf, "/%06"PRIx32, cache->vid);
dir = opendir(idx_buf.buf);
@@ -1119,7 +1120,7 @@ static int load_existing_cache(void)
int ret = 0;
strbuf_init(&vid_buf, PATH_MAX);
- strbuf_addstr(&vid_buf, cache_dir);
+ strbuf_addstr(&vid_buf, object_cache_dir);
dir = opendir(vid_buf.buf);
if (!dir) {
@@ -1166,7 +1167,7 @@ int object_cache_init(const char *p)
goto err;
}
}
- strbuf_copyout(&buf, cache_dir, sizeof(cache_dir));
+ strbuf_copyout(&buf, object_cache_dir, sizeof(object_cache_dir));
CDS_INIT_LIST_HEAD(&sys_cache.cache_lru_list);
uatomic_set(&sys_cache.cache_size, 0);
@@ -1177,3 +1178,18 @@ err:
strbuf_release(&buf);
return ret;
}
+
+void object_cache_format(void)
+{
+ struct object_cache *cache;
+ struct hlist_node *node, *t;
+ int i;
+
+ for (i = 0; i < HASH_SIZE; i ++) {
+ struct hlist_head *head = cache_hashtable + i;
+ hlist_for_each_entry_safe(cache, node, t, head, hash) {
+ object_cache_delete(cache->vid);
+ }
+ }
+ uatomic_set(&sys_cache.cache_size, 0);
+}
diff --git a/sheep/plain_store.c b/sheep/plain_store.c
index 9cef0d9..33e40a9 100644
--- a/sheep/plain_store.c
+++ b/sheep/plain_store.c
@@ -472,6 +472,8 @@ int default_format(void)
eprintf("%m\n");
return SD_RES_EIO;
}
+ if (is_object_cache_enabled())
+ object_cache_format();
return SD_RES_SUCCESS;
}
diff --git a/sheep/sheep_priv.h b/sheep/sheep_priv.h
index 6653c68..44380fc 100644
--- a/sheep/sheep_priv.h
+++ b/sheep/sheep_priv.h
@@ -379,6 +379,7 @@ int default_flush(void);
/* object_cache */
+void object_cache_format(void);
bool bypass_object_cache(const struct request *req);
bool object_is_cached(uint64_t oid);
--
1.7.9.5
More information about the sheepdog
mailing list