Make config.h more explicit by including as src/config.h

Change-Id: I8f0b2d13a0683b43df21653f6b91d547322e3d93
Reviewed-on: http://review.couchbase.org/35161
Reviewed-by: Trond Norbye

Make config.h more explicit by including as src/config.h

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

show more ...

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 ...

Move towards C89

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

Move towards C89

Change-Id: I9953891a2fa858b0a957faaa5974fbe2b7ba3ac5
Reviewed-on: http://review.couchbase.org/31537
Reviewed-by: Trond Norbye <trond.norbye@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 ...

Require libconflate

We are using libconflate in our product so it shouldn't be
optional. This simplifies the move towards CMake

Change-Id: Icb49849018d8c0a60436c62a5a87114edf470

Require libconflate

We are using libconflate in our product so it shouldn't be
optional. This simplifies the move towards CMake

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

show more ...

Require libvbucket

We are currently building moxi with libvbucket in our
product, and this commit is part of the process to simplify
our build process. By removing everything we don'

Require libvbucket

We are currently building moxi with libvbucket in our
product, and this commit is part of the process to simplify
our build process. By removing everything we don't use it'll
be easier to know which parts needs moving over to CMake.

Change-Id: I7258260405f95a281f4fd37b3c98fa4488b0daac
Reviewed-on: http://review.couchbase.org/26951
Reviewed-by: Steve Yen <steve.yen@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-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 ...

Exit if empty -z configuration

Change-Id: I591319f81f1e8ed1f42d9d709876f774eb05159b
Reviewed-on: http://review.membase.org/5836
Reviewed-by: Bin Cui <bin.cui@gmail.com>
Reviewed-

Exit if empty -z configuration

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

show more ...

Allow comment characters in -Z config files

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

Allow comment characters in -Z config files

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

show more ...

pt-12636461 - default timeout config

Values taken from the default configurations from membase/ns_server
for server-side moxi.

Change-Id: I261b02b86e30962d6278dca3c8077d5563fd86

pt-12636461 - default timeout config

Values taken from the default configurations from membase/ns_server
for server-side moxi.

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

show more ...

MB-2403 - default to 200ms clock cycle for better logging

Change-Id: I046b42b604957f8a25dbf5809208cb370470cb53
Reviewed-on: http://review.membase.org/5133
Tested-by: Aliaksey Kandrat

MB-2403 - default to 200ms clock cycle for better logging

Change-Id: I046b42b604957f8a25dbf5809208cb370470cb53
Reviewed-on: http://review.membase.org/5133
Tested-by: Aliaksey Kandratsenka <alkondratenko@gmail.com>
Reviewed-by: Aliaksey Kandratsenka <alkondratenko@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 ...

MB-2899 - parsing config using safe_strtoul functions

Change-Id: I32acf0c94a4a8f0b2b9cc0c6e0518739fb71c09b
Reviewed-on: http://review.membase.org/3741
Tested-by: Chiyoung Seo <chiyou

MB-2899 - parsing config using safe_strtoul functions

Change-Id: I32acf0c94a4a8f0b2b9cc0c6e0518739fb71c09b
Reviewed-on: http://review.membase.org/3741
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-2806 - connect_timeout is now -Z configurable

The timeout for connect() still defaults to 5 seconds,
but is now optionally -Z command-line configurable.

Change-Id: I6422990b2

MB-2806 - connect_timeout is now -Z configurable

The timeout for connect() still defaults to 5 seconds,
but is now optionally -Z command-line configurable.

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

show more ...

MB-2807 - moxi configuration synonyms

-- "concurrency" is a new synonym for the ever-confusing
"downstream_max".

-- "downstream_conn_timeout" is new synonym for
"downs

MB-2807 - moxi configuration synonyms

-- "concurrency" is a new synonym for the ever-confusing
"downstream_max".

-- "downstream_conn_timeout" is new synonym for
"downstream_timeout".

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

show more ...

MB-2724 - configurable auth_timeout with auth timeout blacklisting

auth_timeout is now command-line configurable, and can now be used
with the zstored downstream conn blacklisting flags.

MB-2724 - configurable auth_timeout with auth timeout blacklisting

auth_timeout is now command-line configurable, and can now be used
with the zstored downstream conn blacklisting flags. For example...

cycle=200,
connect_max_errors=10,
connect_retry_interval=30000,
auth_timeout=100,
...

A new tot_auth_timeout stat also tracks how often we see
an auth timeout error.

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

show more ...

implemented gdb-callable connections_diag

This provides relatively easily accessible high-level diagnostics of
what is going on inside moxi

Change-Id: Iff04d63be694891bf0d329a89

implemented gdb-callable connections_diag

This provides relatively easily accessible high-level diagnostics of
what is going on inside moxi

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

show more ...

bug 2570 - downstream_conn_max unlimited again

Change-Id: If48ad1ab11023e2ecf7d681d14a5f32fc4cc3876

bug 2576 - relevant err msg when bad uds socket

Change-Id: I714feaf92d0596c8f81e6c60ccb8848345ecc585
Reviewed-on: http://review.northscale.com/2884
Reviewed-by: Steve Yen <steve.yen@

bug 2576 - relevant err msg when bad uds socket

Change-Id: I714feaf92d0596c8f81e6c60ccb8848345ecc585
Reviewed-on: http://review.northscale.com/2884
Reviewed-by: Steve Yen <steve.yen@gmail.com>
Tested-by: Steve Yen <steve.yen@gmail.com>

show more ...

bug 1998 - handle missing default bucket correctly

This change introduces or corrects a few related concepts...

- default_bucket_name
- This is a -Z cmd-line key-value paramet

bug 1998 - handle missing default bucket correctly

This change introduces or corrects a few related concepts...

- default_bucket_name
- This is a -Z cmd-line key-value parameter. Example:
"-Z default_bucket_name=default,port_listen=11211"
- By default, the default_bucket_name parameter is,
confusingly, FIRST_BUCKET.
- moxi assign new client/upstream connections to the bucket named
$(default_bucket_name), if it exists. If that named bucket
doesn't exist, new client/upstream connections are assigned
to the NULL_BUCKET.

- FIRST_BUCKET
- A special bucket name, used like a sentinel value.
- Have moxi assign new connections to the first configured bucket.
Confusingly, this is the default for the default_bucket_name.

- NULL_BUCKET
- A special bucket name, used like a sentinel value.
- This refers to a special black-hole bucket, where any mutations
result in SERVER_ERROR responses, and get's result in misses/END.

When moxi is used standalone on a per-bucket basis, the
default_bucket_name is left unspecifiedm, so FIRST_BUCKET.

When moxi is used as a gateway proxy, default_bucket_name=default.

Change-Id: Idfbdf68a75964fe84dee0c52e8d54fc90834cca8
Reviewed-on: http://review.northscale.com/2824
Reviewed-by: Dustin Sallings <dustin@spy.net>
Tested-by: Steve Yen <steve.yen@gmail.com>

show more ...

downstream_max / downstream_conn_max defaults

200 is too optimistic, given the NUM_THREADS factor.

Change-Id: Iea9e767090d7f486efc17afdf4b712280c6fc21c
Reviewed-on: http://revie

downstream_max / downstream_conn_max defaults

200 is too optimistic, given the NUM_THREADS factor.

Change-Id: Iea9e767090d7f486efc17afdf4b712280c6fc21c
Reviewed-on: http://review.northscale.com/2696
Tested-by: Matt Ingenthron <matt@northscale.com>
Reviewed-by: Matt Ingenthron <matt@northscale.com>

show more ...