nutcracker 0.2.4.1 → 0.2.4.2

data/ext/nutcracker/src/nc_conf.c

@@ -1109,14 +1109,6 @@ conf_pre_validate(struct conf *cf)
     return NC_OK;
 }
 
-static int
-conf_server_pname_cmp(const void *t1, const void *t2)
-{
-    const struct conf_server *s1 = t1, *s2 = t2;
-
-    return string_compare(&s1->pname, &s2->pname);
-}
-
 static int
 conf_server_name_cmp(const void *t1, const void *t2)
 {
@@ -1156,27 +1148,10 @@ conf_validate_server(struct conf *cf, struct conf_pool *cp)
 
     /*
      * Disallow duplicate servers - servers with identical "host:port:weight"
-     * or "name" combination are considered as duplicates
+     * or "name" combination are considered as duplicates. When server name
+     * is configured, we only check for duplicate "name" and not for duplicate
+     * "host:port:weight"
      */
-    array_sort(&cp->server, conf_server_pname_cmp);
-    for (valid = true, i = 0; i < nserver - 1; i++) {
-        struct conf_server *cs1, *cs2;
-
-        cs1 = array_get(&cp->server, i);
-        cs2 = array_get(&cp->server, i + 1);
-
-        if (string_compare(&cs1->pname, &cs2->pname) == 0) {
-            log_error("conf: pool '%.*s' has servers with same name '%.*s'",
-                    cp->name.len, cp->name.data, cs1->pname.len,
-                    cs1->pname.data);
-            valid = false;
-            break;
-        }
-    }
-    if (!valid) {
-        return NC_ERROR;
-    }
-
     array_sort(&cp->server, conf_server_name_cmp);
     for (valid = true, i = 0; i < nserver - 1; i++) {
         struct conf_server *cs1, *cs2;
@@ -1497,7 +1472,7 @@ conf_add_server(struct conf *cf, struct command *cmd, void *conf)
     struct conf_server *field;
     uint8_t *p, *q, *start;
     uint8_t *pname, *addr, *port, *weight, *name;
-    uint32_t k, pnamelen, addrlen, portlen, weightlen, namelen;
+    uint32_t k, delimlen, pnamelen, addrlen, portlen, weightlen, namelen;
     struct string address;
     char delim[] = " ::";
 
@@ -1514,7 +1489,7 @@ conf_add_server(struct conf *cf, struct command *cmd, void *conf)
 
     value = array_top(&cf->arg);
 
-    /* parse "hostname:port:weight [name]" from the end */
+    /* parse "hostname:port:weight [name]" or "/path/unix_socket:weight [name]" from the end */
     p = value->data + value->len - 1;
     start = value->data;
     addr = NULL;
@@ -1526,6 +1501,8 @@ conf_add_server(struct conf *cf, struct command *cmd, void *conf)
     name = NULL;
     namelen = 0;
 
+    delimlen = value->data[0] == '/' ? 2 : 3;
+
     for (k = 0; k < sizeof(delim); k++) {
         q = nc_strrchr(p, start, delim[k]);
         if (q == NULL) {
@@ -1562,8 +1539,8 @@ conf_add_server(struct conf *cf, struct command *cmd, void *conf)
         p = q - 1;
     }
 
-    if (k != 3) {
-        return "has an invalid \"hostname:port:weight [name]\" format string";
+    if (k != delimlen) {
+        return "has an invalid \"hostname:port:weight [name]\"or \"/path/unix_socket:weight [name]\" format string";
     }
 
     pname = value->data;
@@ -1582,9 +1559,11 @@ conf_add_server(struct conf *cf, struct command *cmd, void *conf)
         return "has an invalid weight in \"hostname:port:weight [name]\" format string";
     }
 
-    field->port = nc_atoi(port, portlen);
-    if (field->port < 0 || !nc_valid_port(field->port)) {
-        return "has an invalid port in \"hostname:port:weight [name]\" format string";
+    if (value->data[0] != '/') {
+        field->port = nc_atoi(port, portlen);
+        if (field->port < 0 || !nc_valid_port(field->port)) {
+            return "has an invalid port in \"hostname:port:weight [name]\" format string";
+        }
     }
 
     if (name == NULL) {

data/ext/nutcracker/src/nc_conf.h

@@ -120,7 +120,7 @@ char *conf_set_string(struct conf *cf, struct command *cmd, void *conf);
 char *conf_set_listen(struct conf *cf, struct command *cmd, void *conf);
 char *conf_add_server(struct conf *cf, struct command *cmd, void *conf);
 char *conf_set_num(struct conf *cf, struct command *cmd, void *conf);
-char * conf_set_bool(struct conf *cf, struct command *cmd, void *conf);
+char *conf_set_bool(struct conf *cf, struct command *cmd, void *conf);
 char *conf_set_hash(struct conf *cf, struct command *cmd, void *conf);
 char *conf_set_distribution(struct conf *cf, struct command *cmd, void *conf);
 char *conf_set_hashtag(struct conf *cf, struct command *cmd, void *conf);

data/ext/nutcracker/src/nc_message.h

@@ -71,6 +71,7 @@ typedef enum msg_type {
     MSG_REQ_REDIS_BITCOUNT,
     MSG_REQ_REDIS_DECR,
     MSG_REQ_REDIS_DECRBY,
+    MSG_REQ_REDIS_DUMP,
     MSG_REQ_REDIS_GET,
     MSG_REQ_REDIS_GETBIT,
     MSG_REQ_REDIS_GETRANGE,
@@ -80,6 +81,7 @@ typedef enum msg_type {
     MSG_REQ_REDIS_INCRBYFLOAT,
     MSG_REQ_REDIS_MGET,
     MSG_REQ_REDIS_PSETEX,
+    MSG_REQ_REDIS_RESTORE,
     MSG_REQ_REDIS_SET,
     MSG_REQ_REDIS_SETBIT,
     MSG_REQ_REDIS_SETEX,

data/ext/nutcracker/src/nc_server.c

@@ -451,7 +451,7 @@ server_connect(struct context *ctx, struct server *server, struct conn *conn)
     log_debug(LOG_VVERB, "connect to server '%.*s'", server->pname.len,
               server->pname.data);
 
-	conn->sd = socket(conn->family, SOCK_STREAM, 0);
+    conn->sd = socket(conn->family, SOCK_STREAM, 0);
     if (conn->sd < 0) {
         log_error("socket for server '%.*s' failed: %s", server->pname.len,
                   server->pname.data, strerror(errno));
@@ -467,11 +467,13 @@ server_connect(struct context *ctx, struct server *server, struct conn *conn)
         goto error;
     }
 
-    status = nc_set_tcpnodelay(conn->sd);
-    if (status != NC_OK) {
-        log_warn("set tcpnodelay on s %d for server '%.*s' failed, ignored: %s",
-                 conn->sd, server->pname.len, server->pname.data,
-                 strerror(errno));
+    if (server->pname.data[0] != '/') {
+        status = nc_set_tcpnodelay(conn->sd);
+        if (status != NC_OK) {
+            log_warn("set tcpnodelay on s %d for server '%.*s' failed, ignored: %s",
+                     conn->sd, server->pname.len, server->pname.data,
+                     strerror(errno));
+        }
     }
 
     status = event_add_conn(ctx->ep, conn);
@@ -484,7 +486,7 @@ server_connect(struct context *ctx, struct server *server, struct conn *conn)
 
     ASSERT(!conn->connecting && !conn->connected);
 
-	status = connect(conn->sd, conn->addr, conn->addrlen);
+    status = connect(conn->sd, conn->addr, conn->addrlen);
     if (status != NC_OK) {
         if (errno == EINPROGRESS) {
             conn->connecting = 1;

data/ext/nutcracker/src/proto/Makefile.in

@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11 from Makefile.am.
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -93,6 +93,7 @@ CXXFLAGS = @CXXFLAGS@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -116,6 +117,7 @@ LIPO = @LIPO@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -141,6 +143,7 @@ abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -174,7 +177,6 @@ libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
@@ -237,7 +239,7 @@ $(am__aclocal_m4_deps):
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libproto.a: $(libproto_a_OBJECTS) $(libproto_a_DEPENDENCIES) 
+libproto.a: $(libproto_a_OBJECTS) $(libproto_a_DEPENDENCIES) $(EXTRA_libproto_a_DEPENDENCIES) 
 	-rm -f libproto.a
 	$(libproto_a_AR) libproto.a $(libproto_a_OBJECTS) $(libproto_a_LIBADD)
 	$(RANLIB) libproto.a
@@ -374,10 +376,15 @@ install-am: all-am
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:

data/ext/nutcracker/src/proto/nc_redis.c

@@ -34,6 +34,7 @@ redis_arg0(struct msg *r)
     case MSG_REQ_REDIS_PTTL:
     case MSG_REQ_REDIS_TTL:
     case MSG_REQ_REDIS_TYPE:
+    case MSG_REQ_REDIS_DUMP:
 
     case MSG_REQ_REDIS_DECR:
     case MSG_REQ_REDIS_GET:
@@ -138,6 +139,8 @@ redis_arg2(struct msg *r)
     case MSG_REQ_REDIS_ZINCRBY:
     case MSG_REQ_REDIS_ZREMRANGEBYRANK:
     case MSG_REQ_REDIS_ZREMRANGEBYSCORE:
+
+    case MSG_REQ_REDIS_RESTORE:
         return true;
 
     default:
@@ -458,6 +461,11 @@ redis_parse_req(struct msg *r)
                     break;
                 }
 
+                if (str4icmp(m, 'd', 'u', 'm', 'p')) {
+                    r->type = MSG_REQ_REDIS_DUMP;
+                    break;
+                }
+
                 if (str4icmp(m, 'h', 'd', 'e', 'l')) {
                     r->type = MSG_REQ_REDIS_HDEL;
                     break;
@@ -767,6 +775,11 @@ redis_parse_req(struct msg *r)
                     break;
                 }
 
+                if (str7icmp(m, 'r', 'e', 's', 't', 'o', 'r', 'e')) {
+                    r->type = MSG_REQ_REDIS_RESTORE;
+                    break;
+                }
+
                 break;
 
             case 8:
@@ -947,11 +960,11 @@ redis_parse_req(struct msg *r)
                               "key", r->id, r->type);
                     goto error;
                 }
-                if (r->rlen > mbuf_data_size()) {
+                if (r->rlen >= mbuf_data_size()) {
                     log_error("parsed bad req %"PRIu64" of type %d with key "
-                              "length %d that exceeds maximum redis key "
-                              "length of %d", r->id, r->type, r->rlen,
-                              mbuf_data_size());
+                              "length %d that greater than or equal to maximum"
+                              " redis key length of %d", r->id, r->type,
+                              r->rlen, mbuf_data_size());
                     goto error;
                 }
                 if (r->rnarg == 0) {

data/lib/nutcracker/version.rb

@@ -1,3 +1,3 @@
 module Nutcracker
-  VERSION = "0.2.4.1".freeze
+  VERSION = "0.2.4.2".freeze
 end

data/lib/nutcracker.rb

@@ -1,7 +1,65 @@
 require 'nutcracker/version'
+require 'socket'
+require 'json'
 
 module Nutcracker
+
+  def self.start options
+    Nutcracker::Process.new(options).start
+  end
+
+  def self.executable
+    File.expand_path("../../ext/nutcracker/src/nutcracker", __FILE__)
+  end
+
   def self.version
-    VERSION
+    Nutcracker::VERSION
   end
-end
+
+  class Process
+    attr_reader :pid, :options
+
+    def initialize options
+      @options = options
+    end
+
+    def start
+      raise RuntimeError, "Nutcracker is already running (#{pid})..." if running?
+      @pid = ::Process.spawn("#{Nutcracker.executable} -c #{options.fetch(:config_file).inspect}")
+      Kernel.at_exit { stop if running? }
+      self
+    end
+
+    def running?
+      !!(pid and ::Process.getpgid pid rescue false)
+    end
+
+    def stop
+      signal :TERM
+    end
+
+    def kill
+      signal :KILL
+    end
+
+    def join
+      verify_running! and ::Process.waitpid2 pid
+    end
+
+    def stats
+      JSON.parse TCPSocket.new('localhost',22222).read rescue {}
+    end
+
+    private
+
+    def verify_running!
+      running? or raise RuntimeError, "Nutcracker isn't running..." 
+    end
+
+    def signal term
+      verify_running! and ::Process.kill(term, pid)
+    end
+
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nutcracker
 version: !ruby/object:Gem::Version
-  version: 0.2.4.1
+  version: 0.2.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-20 00:00:00.000000000 Z
+date: 2013-05-22 00:00:00.000000000 Z
 dependencies: []
 description: Gem/Bundler benefits for Twitter's Nutcraker C app
 email: eran@kontera.com
@@ -113,6 +113,7 @@ files:
 - ext/nutcracker/scripts/redis-check.sh
 - ext/nutcracker/src/hashkit/Makefile.am
 - ext/nutcracker/src/hashkit/Makefile.in
+- ext/nutcracker/src/hashkit/nc_crc16.c
 - ext/nutcracker/src/hashkit/nc_crc32.c
 - ext/nutcracker/src/hashkit/nc_fnv.c
 - ext/nutcracker/src/hashkit/nc_hashkit.h