Refactor: Prepare source to be squashed

Change-Id: I275dc53298b8cd14df84cb528decfe08be32f68e
Reviewed-on: http://review.couchbase.org/34635
Reviewed-by: Trond Norbye <trond.norbye@gm

Refactor: Prepare source to be squashed

Change-Id: I275dc53298b8cd14df84cb528decfe08be32f68e
Reviewed-on: http://review.couchbase.org/34635
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

Cleanup from int to SOCKET

Change-Id: I43e3cc18c2a0c15845296ebfa82c9707482f9f96
Reviewed-on: http://review.couchbase.org/32423
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested

Cleanup from int to SOCKET

Change-Id: I43e3cc18c2a0c15845296ebfa82c9707482f9f96
Reviewed-on: http://review.couchbase.org/32423
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

Use libplatform instead of pthread

Change-Id: Id366ec26ddd2e68022e70cb6fd84a00a21a04313
Reviewed-on: http://review.couchbase.org/32422
Reviewed-by: Steve Yen <steve.yen@gmail.com>

Use libplatform instead of pthread

Change-Id: Id366ec26ddd2e68022e70cb6fd84a00a21a04313
Reviewed-on: http://review.couchbase.org/32422
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

Use C-stype comments

Change-Id: Ib374e49763843988b26f726220b66372c84828f5
Reviewed-on: http://review.couchbase.org/30327
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested

Use C-stype comments

Change-Id: Ib374e49763843988b26f726220b66372c84828f5
Reviewed-on: http://review.couchbase.org/30327
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>

show more ...

MB-2897 - use 64-bits for msec_current time

32-bits overlows after 49+ days, and 64-bits should be enough for
anybody.

Change-Id: I769839ee4cb41f10ce808cf7f669c0cd1beb7245
R

MB-2897 - use 64-bits for msec_current time

32-bits overlows after 49+ days, and 64-bits should be enough for
anybody.

Change-Id: I769839ee4cb41f10ce808cf7f669c0cd1beb7245
Reviewed-on: http://review.couchbase.org/7748
Reviewed-by: Bin Cui <bin.cui@gmail.com>
Tested-by: Steve Yen <steve.yen@gmail.com>

show more ...

MB-3849 - SERVER_ERROR proxy write to downstream $HOST

Changed the error message to include the downstream host which moxi
could not propagate the request to.

Change-Id: Ia3e0bb

MB-3849 - SERVER_ERROR proxy write to downstream $HOST

Changed the error message to include the downstream host which moxi
could not propagate the request to.

Change-Id: Ia3e0bbc7ccf2f2ae203aaff56b60f571a1036b75
Reviewed-on: http://review.membase.org/6269
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>

show more ...

MB-3849 - SERVER_ERROR proxy downstream closed $HOST_IDENT

Change-Id: Ibe9fd62bc76fc1f14554977f592ef347f871d734
Reviewed-on: http://review.membase.org/6268
Tested-by: Aliaksey Kandra

MB-3849 - SERVER_ERROR proxy downstream closed $HOST_IDENT

Change-Id: Ibe9fd62bc76fc1f14554977f592ef347f871d734
Reviewed-on: http://review.membase.org/6268
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>

show more ...

MB-3479 - Use binary protocol EBUSY & EINTERNAL instead of ENOMEM

Instead of over-using the OOM / ENOMEM binary protocol response
error...

- Return EBUSY during a timeout.
-

MB-3479 - Use binary protocol EBUSY & EINTERNAL instead of ENOMEM

Instead of over-using the OOM / ENOMEM binary protocol response
error...

- Return EBUSY during a timeout.
- Return EINTERNAL for closed sockets & down servers.
- Return ENOMEM when memcached returns ENOMEM.

Also, use EINTERNAL rather than ENOMEM as the generic catch-all error
code, which should reduce confusion ("but, I'm not actually out of
memory").

Change-Id: I207903f0c4d5b967866c67cb61ac3b43a832d5cd
Reviewed-on: http://review.membase.org/6177
Tested-by: Steve Yen <steve.yen@gmail.com>
Reviewed-by: Steve Yen <steve.yen@gmail.com>

show more ...

MB-3798 - moxi option for ketama/weighted/modula item distributions

When using libmemcached, start moxi with an extra -Z key=value
configuration option...

moxi -Z mcs_opts=dis

MB-3798 - moxi option for ketama/weighted/modula item distributions

When using libmemcached, start moxi with an extra -Z key=value
configuration option...

moxi -Z mcs_opts=distribution:ketama
moxi -Z mcs_opts=distribution:ketama-weighted
moxi -Z mcs_opts=distribution:modula

In this commit, moxi stays with distribution:ketama as its default and
a later debate can change that.

Change-Id: I36d3df3a2ba79c9d793a5e1e1a31d0d24ba48450
Reviewed-on: http://review.membase.org/6138
Tested-by: Steve Yen <steve.yen@gmail.com>
Reviewed-by: Matt Ingenthron <matt@northscale.com>

show more ...

added stats for local & total latencies

NOTE: that we assume that first server in downstream server list is
'local'. Corresponding change will be made to ns_server.

Change-Id: I

added stats for local & total latencies

NOTE: that we assume that first server in downstream server list is
'local'. Corresponding change will be made to ns_server.

Change-Id: I8dd5c61828f6cdcc3c75a0e4f8d2559731701341
Reviewed-on: http://review.membase.org/4499
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Steve Yen <steve.yen@gmail.com>

show more ...

replaced self parameter with local

local requests are requests to first downstream server

Change-Id: I9e95bffd6adc388f55986b280c2023eda61d66e8
Reviewed-on: http://review.membase

replaced self parameter with local

local requests are requests to first downstream server

Change-Id: I9e95bffd6adc388f55986b280c2023eda61d66e8
Reviewed-on: http://review.membase.org/4497
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Steve Yen <steve.yen@gmail.com>

show more ...

removed tot_optimize_self stat

Change-Id: I04a9063b9dc230784a3034a4c6ad4567faac77c8
Reviewed-on: http://review.membase.org/4496
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Teste

removed tot_optimize_self stat

Change-Id: I04a9063b9dc230784a3034a4c6ad4567faac77c8
Reviewed-on: http://review.membase.org/4496
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>

show more ...

removed self-optimization

Change-Id: I1eb77daded0a5e4ecaec0a0507ae0d89ce08021c
Reviewed-on: http://review.membase.org/4495
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested-by:

removed self-optimization

Change-Id: I1eb77daded0a5e4ecaec0a0507ae0d89ce08021c
Reviewed-on: http://review.membase.org/4495
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>

show more ...

MB-3389 - b2b not-my-vbucket handling

This bug fix required these changes...

- binary protocol ntohs(status) conversion, so the NOT_MY_VBUCKET
status code comparison actually

MB-3389 - b2b not-my-vbucket handling

This bug fix required these changes...

- binary protocol ntohs(status) conversion, so the NOT_MY_VBUCKET
status code comparison actually works.

- remove an assert() so that b2b request retry codepath works.

- send binary error message to binary upstream clients instead of
an ASCII protocol error string.

Test hint -- point: memcachetest -h HOST:11211 -i 1 -c 1000 -l -L 2
at moxi while adding & removing servers in a cluster.

Change-Id: I06aba8cc3390042cc7430a3b4d5c659421f112de
Reviewed-on: http://review.membase.org/4374
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>

show more ...

MB-3175 - SERVER_ERROR proxy downstream timeout

Provide a slightly different ascii error response if moxi hits a
downstream timeout.

Change-Id: Icb4501f1e255072263d96b17ea40a4e0

MB-3175 - SERVER_ERROR proxy downstream timeout

Provide a slightly different ascii error response if moxi hits a
downstream timeout.

Change-Id: Icb4501f1e255072263d96b17ea40a4e006a011de
Reviewed-on: http://review.membase.org/4073
Reviewed-by: Dustin Sallings <dustin@spy.net>
Tested-by: Steve Yen <steve.yen@gmail.com>

show more ...

MB-3113 - allow conn_init() callbacks to return an error

Change-Id: Ie3a41ea3f3009eb7995200bed7c01a219aa4baba
Reviewed-on: http://review.membase.org/4007
Tested-by: Sean Lynch <seanl

MB-3113 - allow conn_init() callbacks to return an error

Change-Id: Ie3a41ea3f3009eb7995200bed7c01a219aa4baba
Reviewed-on: http://review.membase.org/4007
Tested-by: Sean Lynch <seanl@literati.org>
Reviewed-by: Sean Lynch <seanl@literati.org>

show more ...

Ascii and Binary implementation for unl (unlock key)

unl is a membase command which is used to unlock a key
which was previously locked by getl.

Sample interaction:

B:l

Ascii and Binary implementation for unl (unlock key)

unl is a membase command which is used to unlock a key
which was previously locked by getl.

Sample interaction:

B:localhost:11211 unl k1 665
UNLOCK_ERROR
B:localhost:11211 getl k1
VALUE k1 0 5 666
manik
END
B:localhost:11211 unl k1 666
UNLOCKED

Change-Id: I0213b90535f60559f9606c73f4c83e70380990d0
Reviewed-on: http://review.membase.org/3910
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested-by: Steve Yen <steve.yen@gmail.com>

show more ...

stats for downstream_conn_queue add/remove

Change-Id: I9d409005ce508669426f4be203501a7e16566ae5
Reviewed-on: http://review.membase.org/3969
Tested-by: Chiyoung Seo <chiyoung.seo@gmai

stats for downstream_conn_queue add/remove

Change-Id: I9d409005ce508669426f4be203501a7e16566ae5
Reviewed-on: http://review.membase.org/3969
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>

show more ...

MB-3067 - suffix missing for broadcast commands on connect error

During broadcast commands like "stats", if one of the downstream conns
had a connect error, moxi wouldn't send back a res

MB-3067 - suffix missing for broadcast commands on connect error

During broadcast commands like "stats", if one of the downstream conns
had a connect error, moxi wouldn't send back a response suffix (like
"END\r\n"). This would block clients like memcachetest which use
stats. This originated due to the zstored conn pooling enhancement
where the original response suffix code ended up now being too late in
the codepath.

Change-Id: Id08b12d2953843a73f3887d048cafdef594ea501
Reviewed-on: http://review.membase.org/3929
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Tested-by: Steve Yen <steve.yen@gmail.com>

show more ...

MB-2980 - front cache helper functions to avoid over-deleting

New helper functions cproxy_front_cache_key() and
cproxy_front_cache_delete(), originally via code patches
from Paul Gal

MB-2980 - front cache helper functions to avoid over-deleting

New helper functions cproxy_front_cache_key() and
cproxy_front_cache_delete(), originally via code patches
from Paul Gale.

These will help reduce unnecessary calls to mcache_delete()
which will help keep better front cache statistics.

Change-Id: If53ff0dbc3953ec74bb5d6bee8e6dfb4872f398e
Reviewed-on: http://review.membase.org/3906
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Tested-by: Steve Yen <steve.yen@gmail.com>

show more ...

MB-2972 - return SERVER_ERROR for membase bucket GET's

But, still return END's for memcached bucket GET's.

Change-Id: Ie6c658b006eb870609e78b2b4988e12636fe08b2
Reviewed-on: http

MB-2972 - return SERVER_ERROR for membase bucket GET's

But, still return END's for memcached bucket GET's.

Change-Id: Ie6c658b006eb870609e78b2b4988e12636fe08b2
Reviewed-on: http://review.membase.org/3839
Tested-by: Matt Ingenthron <matt@northscale.com>
Reviewed-by: Matt Ingenthron <matt@northscale.com>

show more ...

stat for tot_downstream_connect_wait

This is incremented whenever moxi attempts to connect() and
gets an EINPROGRESS.

Also, made the connect_timeout & auth_timeout more visible

stat for tot_downstream_connect_wait

This is incremented whenever moxi attempts to connect() and
gets an EINPROGRESS.

Also, made the connect_timeout & auth_timeout more visible
in the stats output.

Change-Id: I3b3584da3e1cd618462a2aced9d0430f430783c6
Reviewed-on: http://review.membase.org/3709
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>

show more ...

usage info for the additional timeouts

Change-Id: I5a875851a27dcb289634985e301c288028f137e7
Reviewed-on: http://review.membase.org/3690
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.co

usage info for the additional timeouts

Change-Id: I5a875851a27dcb289634985e301c288028f137e7
Reviewed-on: http://review.membase.org/3690
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>

show more ...

MB-2825 - downstream_conn_queue_timeout

Change-Id: I5ff23cc71cfafdec38b1cef6157f1fc7c942d8a4
Reviewed-on: http://review.membase.org/3684
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.c

MB-2825 - downstream_conn_queue_timeout

Change-Id: I5ff23cc71cfafdec38b1cef6157f1fc7c942d8a4
Reviewed-on: http://review.membase.org/3684
Tested-by: Chiyoung Seo <chiyoung.seo@gmail.com>
Reviewed-by: Chiyoung Seo <chiyoung.seo@gmail.com>

show more ...

MB-2808 - tot_downstream_connect_started stat

Added a new tot_downstream_connect_started, to prove that
moxi gets stuck in the connect() phase when you kill -STOP
the memcached that

MB-2808 - tot_downstream_connect_started stat

Added a new tot_downstream_connect_started, to prove that
moxi gets stuck in the connect() phase when you kill -STOP
the memcached that moxi is talking to.

Change-Id: Iedeaff512938e611e402e117ad1544e688a70486
Reviewed-on: http://review.membase.org/3658
Reviewed-by: Dustin Sallings <dustin@spy.net>
Tested-by: Steve Yen <steve.yen@gmail.com>

show more ...