[sheepdog] [PATCH 1/6] sheep: remove accord cluster driver
Liu Yuan
namei.unix at gmail.com
Sun Jan 27 08:43:42 CET 2013
From: Liu Yuan <tailai.ly at taobao.com>
Accord driver is not maintained at all and now it can't be setup with sheep
with simple operations and future Shepherd will deprecate it.
Signed-off-by: Liu Yuan <tailai.ly at taobao.com>
---
configure.ac | 11 -
sheep/Makefile.am | 3 -
sheep/cluster/accord.c | 590 ------------------------------------------------
3 files changed, 604 deletions(-)
delete mode 100644 sheep/cluster/accord.c
diff --git a/configure.ac b/configure.ac
index 9e03e23..e610f12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,11 +192,6 @@ AC_ARG_ENABLE([zookeeper],
[ enable_zookeeper="no" ],)
AM_CONDITIONAL(BUILD_ZOOKEEPER, test x$enable_zookeeper = xyes)
-AC_ARG_ENABLE([accord],
- [ --enable-accord : build accord cluster driver ],,
- [ enable_accord="no" ],)
-AM_CONDITIONAL(BUILD_ACCORD, test x$enable_accord = xyes)
-
AC_ARG_WITH([initddir],
[ --with-initddir=DIR : path to init script directory. ],
[ INITDDIR="$withval" ],
@@ -268,12 +263,6 @@ if test "x${enable_zookeeper}" = xyes; then
PACKAGE_FEATURES="$PACKAGE_FEATURES zookeeper"
fi
-if test "x${enable_accord}" = xyes; then
- PKG_CHECK_MODULES([libacrd],[libacrd])
- AC_DEFINE_UNQUOTED([HAVE_ACCORD], 1, [have accord])
- PACKAGE_FEATURES="$PACKAGE_FEATURES accord"
-fi
-
if test "x${enable_trace}" = xyes; then
if test "x${enable_debug}" = xyes || \
test "x${enable_coverage}" = xyes; then
diff --git a/sheep/Makefile.am b/sheep/Makefile.am
index 0ae19de..f30c4b5 100644
--- a/sheep/Makefile.am
+++ b/sheep/Makefile.am
@@ -35,9 +35,6 @@ endif
if BUILD_ZOOKEEPER
sheep_SOURCES += cluster/zookeeper.c
endif
-if BUILD_ACCORD
-sheep_SOURCES += cluster/accord.c
-endif
sheep_SOURCES += farm/sha1_file.c farm/trunk.c farm/snap.c farm/farm.c
diff --git a/sheep/cluster/accord.c b/sheep/cluster/accord.c
deleted file mode 100644
index 0cfe0ef..0000000
--- a/sheep/cluster/accord.c
+++ /dev/null
@@ -1,590 +0,0 @@
-/*
- * Copyright (C) 2011 Nippon Telegraph and Telephone Corporation.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License version
- * 2 as published by the Free Software Foundation.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include <stdio.h>
-#include <string.h>
-#include <unistd.h>
-#include <search.h>
-#include <pthread.h>
-#include <sys/epoll.h>
-#include <sys/eventfd.h>
-#include <accord.h>
-
-#include "cluster.h"
-#include "event.h"
-#include "work.h"
-#include "util.h"
-
-#define BASE_FILE "/sheepdog"
-#define LOCK_FILE BASE_FILE "/lock"
-#define QUEUE_FILE BASE_FILE "/queue"
-
-enum acrd_event_type {
- EVENT_JOIN_REQUEST = 1,
- EVENT_JOIN_RESPONSE,
- EVENT_LEAVE,
- EVENT_BLOCK,
- EVENT_NOTIFY,
-};
-
-struct acrd_event {
- enum acrd_event_type type;
- struct sd_node sender;
-
- size_t buf_len;
- uint8_t buf[SD_MAX_EVENT_BUF_SIZE];
-
- size_t nr_nodes; /* the number of sheep */
- struct sd_node nodes[SD_MAX_NODES];
- uint64_t ids[SD_MAX_NODES];
-
- enum cluster_join_result join_result;
-};
-
-static struct sd_node this_node;
-static uint64_t this_id;
-
-
-/* misc functions */
-
-struct acrd_path_list_entry {
- char *path;
-
- struct list_head list;
-};
-
-static void acrd_list_cb(struct acrd_handle *ah, const char *path, void *arg)
-{
- struct acrd_path_list_entry *entry = malloc(sizeof(*entry));
- struct list_head *head = arg;
-
- entry->path = strdup(path);
- list_add_tail(&entry->list, head);
-}
-
-static void for_each_acrd_file(struct acrd_handle *ah, const char *parent,
- void (*func)(struct acrd_handle *ah,
- const char *path, void *arg),
- void *arg)
-{
- LIST_HEAD(path_list);
- struct acrd_path_list_entry *entry;
- struct acrd_listcb listcb = {
- .cb = acrd_list_cb,
- .arg = &path_list,
- };
-
- acrd_list(ah, parent, 0, &listcb);
-
- while (!list_empty(&path_list)) {
- entry = list_first_entry(&path_list, typeof(*entry), list);
-
- func(ah, entry->path, arg);
-
- list_del(&entry->list);
- free(entry->path);
- free(entry);
- }
-}
-
-static void __acrd_del(struct acrd_handle *ah, const char *path, void *arg)
-{
- acrd_del(ah, path, 0);
-}
-
-
-/* Accord-based lock */
-
-static void acrd_lock(struct acrd_handle *ah)
-{
- int rc;
-again:
- rc = acrd_write(ah, LOCK_FILE, &this_id, sizeof(this_id), 0,
- ACRD_FLAG_CREATE | ACRD_FLAG_EXCL);
- if (rc == ACRD_SUCCESS)
- return;
- else if (rc == ACRD_ERR_EXIST) {
- sd_dprintf("retry\n");
- usleep(10000); /* FIXME: use acrd notification */
- goto again;
- } else
- panic("failed to create a lock file\n");
-}
-
-static void acrd_unlock(struct acrd_handle *ah)
-{
- int rc;
-
- rc = acrd_del(ah, LOCK_FILE, 0);
- if (rc != ACRD_SUCCESS)
- panic("failed to release lock\n");
-}
-
-
-/* Accord-based queue */
-
-static int queue_start_pos;
-static int queue_end_pos;
-
-static bool acrd_queue_empty(struct acrd_handle *ah)
-{
- int rc;
- char path[256];
- uint32_t count = 0;
-
- sprintf(path, QUEUE_FILE "/%d", queue_start_pos);
-
- rc = acrd_read(ah, path, NULL, &count, 0, 0);
- if (rc == ACRD_SUCCESS)
- return false;
-
- return true;
-}
-
-static void acrd_queue_push(struct acrd_handle *ah, struct acrd_event *ev)
-{
- int rc;
- char path[256];
-again:
- queue_end_pos++;
- sprintf(path, "%s/%d", QUEUE_FILE, queue_end_pos);
- rc = acrd_write(ah, path, ev, sizeof(*ev), 0,
- ACRD_FLAG_CREATE | ACRD_FLAG_EXCL);
- if (rc == ACRD_ERR_EXIST)
- goto again;
-
- assert(rc == ACRD_SUCCESS);
-
- if (queue_start_pos < 0) {
- /* the first pushed data should be EVENT_JOIN_REQUEST */
- assert(ev->type == EVENT_JOIN_REQUEST);
- queue_start_pos = queue_end_pos;
- }
-}
-
-static int acrd_queue_push_back(struct acrd_handle *ah, struct acrd_event *ev)
-{
- int rc;
- char path[256];
-
- queue_start_pos--;
-
- if (ev) {
- /* update the last popped data */
- sprintf(path, QUEUE_FILE "/%d", queue_start_pos);
- rc = acrd_write(ah, path, ev, sizeof(*ev), 0, 0);
- assert(rc == ACRD_SUCCESS);
- }
-
- return 0;
-}
-
-static int acrd_queue_pop(struct acrd_handle *ah, struct acrd_event *ev)
-{
- int rc;
- char path[256];
- uint32_t len;
-
- if (acrd_queue_empty(ah))
- return -1;
-
- sprintf(path, QUEUE_FILE "/%d", queue_start_pos);
- len = sizeof(*ev);
- rc = acrd_read(ah, path, ev, &len, 0, 0);
- assert(rc == ACRD_SUCCESS);
-
- queue_start_pos++;
-
- return 0;
-}
-
-
-/* Accord driver APIs */
-
-static struct acrd_handle *ahandle;
-static int efd;
-
-static struct work_queue *acrd_wq;
-
-/* get node list from the last pushed data */
-static size_t get_nodes(struct acrd_handle *ah,
- struct sd_node *nodes,
- uint64_t *ids)
-{
- int rc;
- struct acrd_event ev;
- char path[256];
- uint32_t len;
-again:
- len = sizeof(ev);
- sprintf(path, "%s/%d", QUEUE_FILE, queue_end_pos);
- rc = acrd_read(ah, path, &ev, &len, 0, 0);
- if (rc == ACRD_SUCCESS) {
- /* find the latest event */
- queue_end_pos++;
- goto again;
- }
-
- queue_end_pos--;
-
- memcpy(nodes, ev.nodes, sizeof(ev.nodes));
- memcpy(ids, ev.ids, sizeof(ev.ids));
-
- return ev.nr_nodes;
-}
-
-static int add_event(struct acrd_handle *ah, enum acrd_event_type type,
- struct sd_node *node, void *buf,
- size_t buf_len)
-{
- int idx;
- struct sd_node *n;
- uint64_t *i;
- struct acrd_event ev;
-
- acrd_lock(ah);
-
- ev.type = type;
- ev.sender = *node;
- ev.buf_len = buf_len;
- if (buf)
- memcpy(ev.buf, buf, buf_len);
-
- ev.nr_nodes = get_nodes(ah, ev.nodes, ev.ids);
-
- switch (type) {
- case EVENT_JOIN_REQUEST:
- ev.nodes[ev.nr_nodes] = *node;
- ev.ids[ev.nr_nodes] = this_id; /* must be local node */
- ev.nr_nodes++;
- break;
- case EVENT_LEAVE:
- n = lfind(node, ev.nodes, &ev.nr_nodes, sizeof(*n),
- node_id_cmp);
- if (!n)
- goto out;
- idx = n - ev.nodes;
- i = ev.ids + idx;
-
- ev.nr_nodes--;
- memmove(n, n + 1, sizeof(*n) * (ev.nr_nodes - idx));
- memmove(i, i + 1, sizeof(*i) * (ev.nr_nodes - idx));
- break;
- case EVENT_NOTIFY:
- case EVENT_BLOCK:
- break;
- case EVENT_JOIN_RESPONSE:
- abort();
- }
-
- acrd_queue_push(ah, &ev);
-out:
- acrd_unlock(ah);
- return 0;
-}
-
-static void find_queue_end(struct acrd_handle *ah, const char *path, void *arg)
-{
- int max;
-
- sscanf(path, QUEUE_FILE "/%d", &max);
- if (max > *(int *)arg)
- *(int *)arg = max;
-}
-
-static pthread_mutex_t start_lock = PTHREAD_MUTEX_INITIALIZER;
-static pthread_cond_t start_cond = PTHREAD_COND_INITIALIZER;
-
-/* protect queue_start_pos */
-static pthread_mutex_t queue_lock = PTHREAD_MUTEX_INITIALIZER;
-
-static bool need_cleanup;
-
-static void acrd_join_fn(struct acrd_handle *ah, const uint64_t *member_list,
- size_t member_list_entries, uint64_t nodeid, void *arg)
-{
- static bool init;
-
- if (!init) {
- this_id = nodeid;
-
- if (member_list_entries == 1)
- need_cleanup = true;
-
- pthread_mutex_lock(&start_lock);
- pthread_cond_signal(&start_cond);
- pthread_mutex_unlock(&start_lock);
-
- init = true;
- }
-}
-
-struct acrd_leave_info {
- struct acrd_handle *ah;
- uint64_t left_nodeid;
- struct work work;
-};
-
-static void __acrd_leave(struct work *work)
-{
- struct acrd_leave_info *info = container_of(work, typeof(*info), work);
- struct acrd_handle *ah = info->ah;
- int i;
- size_t nr_nodes;
- uint64_t ids[SD_MAX_NODES];
- struct sd_node nodes[SD_MAX_NODES];
- struct acrd_tx *atx;
-
- pthread_mutex_lock(&queue_lock);
-
- /* unlock if left node is locking one */
- atx = acrd_tx_init(ah);
- acrd_tx_cmp(atx, LOCK_FILE, &info->left_nodeid,
- sizeof(info->left_nodeid), 0);
- acrd_tx_del(atx, LOCK_FILE, 0);
- acrd_tx_commit(atx, 0);
- acrd_tx_close(atx);
-
- /* check the failed node */
- nr_nodes = get_nodes(ah, nodes, ids);
-
- for (i = 0; i < nr_nodes; i++) {
- if (ids[i] == info->left_nodeid) {
- add_event(ah, EVENT_LEAVE, nodes + i, NULL, 0);
- break;
- }
- }
-
- pthread_mutex_unlock(&queue_lock);
-}
-
-static void __acrd_leave_done(struct work *work)
-{
- struct acrd_leave_info *info = container_of(work, typeof(*info), work);
-
- free(info);
-}
-
-static void acrd_leave_fn(struct acrd_handle *ah, const uint64_t *member_list,
- size_t member_list_entries, uint64_t nodeid, void *arg)
-{
- struct acrd_leave_info *info;
- static bool left;
-
- if (nodeid == this_id) {
- left = true;
- close(efd);
- }
-
- if (left)
- return;
-
- info = zalloc(sizeof(*info));
- if (!info)
- panic("failed to allocate memory");
-
- info->ah = ah;
- info->left_nodeid = nodeid;
- info->work.fn = __acrd_leave;
- info->work.done = __acrd_leave_done;
-
- /* we cannot call accord APIs in the callback... */
- queue_work(acrd_wq, &info->work);
-}
-
-static void acrd_watch_fn(struct acrd_handle *ah, struct acrd_watch_info *info,
- void *arg)
-{
- eventfd_t value = 1;
-
- eventfd_write(efd, value);
-}
-
-static int accord_join(const struct sd_node *myself,
- void *opaque, size_t opaque_len)
-{
- this_node = *myself;
-
- return add_event(ahandle, EVENT_JOIN_REQUEST, &this_node,
- opaque, opaque_len);
-}
-
-static int accord_leave(void)
-{
- return add_event(ahandle, EVENT_LEAVE, &this_node, NULL, 0);
-}
-
-static int accord_notify(void *msg, size_t msg_len)
-{
- return add_event(ahandle, EVENT_NOTIFY, &this_node, msg, msg_len);
-}
-
-static void accord_block(void)
-{
- add_event(ahandle, EVENT_BLOCK, &this_node, NULL, 0);
-}
-
-static void accord_unblock(void *msg, size_t msg_len)
-{
- struct acrd_event ev;
-
- pthread_mutex_lock(&queue_lock);
-
- acrd_queue_pop(ahandle, &ev);
-
- ev.type = EVENT_NOTIFY;
- ev.buf_len = msg_len;
- if (msg)
- memcpy(ev.buf, msg, msg_len);
-
- acrd_queue_push_back(ahandle, &ev);
-
- pthread_mutex_unlock(&queue_lock);
-}
-
-static void acrd_handler(int listen_fd, int events, void *data)
-{
- int ret;
- eventfd_t value;
- struct acrd_event ev;
- enum cluster_join_result res;
-
- if (events & EPOLLHUP) {
- sd_eprintf("accord driver received EPOLLHUP event, exiting.\n");
- log_close();
- exit(1);
- }
-
- sd_dprintf("read event\n");
-
- ret = eventfd_read(efd, &value);
- if (ret < 0)
- return;
-
- pthread_mutex_lock(&queue_lock);
-
- ret = acrd_queue_pop(ahandle, &ev);
- if (ret < 0)
- goto out;
-
- switch (ev.type) {
- case EVENT_JOIN_REQUEST:
- if (!node_eq(&ev.nodes[0], &this_node)) {
- acrd_queue_push_back(ahandle, NULL);
- break;
- }
-
- res = sd_check_join_cb(&ev.sender, ev.buf);
- ev.join_result = res;
- ev.type = EVENT_JOIN_RESPONSE;
- acrd_queue_push_back(ahandle, &ev);
-
- if (res == CJ_RES_MASTER_TRANSFER) {
- sd_eprintf("failed to join sheepdog cluster: "
- "please retry when master is up\n");
- exit(1);
- }
- break;
- case EVENT_JOIN_RESPONSE:
- if (ev.join_result == CJ_RES_MASTER_TRANSFER) {
- /* FIXME: This code is tricky, but Sheepdog assumes that */
- /* nr_nodes = 1 when join_result = MASTER_TRANSFER... */
- ev.nr_nodes = 1;
- ev.nodes[0] = this_node;
- ev.ids[0] = this_id;
- acrd_queue_push_back(ahandle, &ev);
- acrd_queue_pop(ahandle, &ev);
- }
-
- sd_join_handler(&ev.sender, ev.nodes, ev.nr_nodes,
- ev.join_result, ev.buf);
- break;
- case EVENT_LEAVE:
- sd_leave_handler(&ev.sender, ev.nodes, ev.nr_nodes);
- break;
- case EVENT_BLOCK:
- acrd_queue_push_back(ahandle, NULL);
- sd_block_handler(&ev.sender);
- break;
- case EVENT_NOTIFY:
- sd_notify_handler(&ev.sender, ev.buf, ev.buf_len);
- break;
- }
-out:
- pthread_mutex_unlock(&queue_lock);
-}
-
-static int accord_init(const char *option)
-{
- int ret;
-
- if (!option) {
- sd_eprintf("specify one of the accord servers.\n");
- sd_eprintf("e.g. sheep /store -c accord:127.0.0.1\n");
- return -1;
- }
-
- pthread_mutex_lock(&start_lock);
-
- ahandle = acrd_init(option, 9090, acrd_join_fn, acrd_leave_fn, NULL);
- if (!ahandle) {
- sd_eprintf("failed to connect to accrd server %s\n", option);
- return -1;
- }
-
- efd = eventfd(0, EFD_NONBLOCK);
- if (efd < 0) {
- sd_eprintf("failed to create an event fd: %m\n");
- return -1;
- }
-
- acrd_wq = init_work_queue("accord", true);
- if (!acrd_wq) {
- sd_eprintf("failed to create accord workqueue: %m\n");
- return -1;
- }
-
- pthread_cond_wait(&start_cond, &start_lock);
- pthread_mutex_unlock(&start_lock);
-
- if (need_cleanup)
- for_each_acrd_file(ahandle, BASE_FILE, __acrd_del, NULL);
- else {
- queue_start_pos = -1;
- queue_end_pos = -1;
- for_each_acrd_file(ahandle, QUEUE_FILE, find_queue_end,
- &queue_end_pos);
- }
-
- acrd_add_watch(ahandle, QUEUE_FILE, ACRD_EVENT_PREFIX | ACRD_EVENT_ALL,
- acrd_watch_fn, NULL);
-
- ret = register_event(efd, acrd_handler, NULL);
- if (ret) {
- sd_eprintf("failed to register accord event handler (%d)\n",
- ret);
- return -1;
- }
-
- return 0;
-}
-
-static struct cluster_driver cdrv_accord = {
- .name = "accord",
-
- .init = accord_init,
- .join = accord_join,
- .leave = accord_leave,
- .notify = accord_notify,
- .block = accord_block,
- .unblock = accord_unblock,
-};
-
-cdrv_register(cdrv_accord);
--
1.7.9.5
More information about the sheepdog
mailing list