Permalink
Browse files

Merge branch 'branch-18' into branch-20

This merges bulk of membase -> couchbase renaming.

* branch-18-merge:
  Rename ns_server.app description to Couchbase
  Finalized 1.8 getting started docs link
  Getting Started link changed for 1.8
  Renamed Membase to Couchbase in src strings
  Rename Membase to Couchbase in index.html
  Path renames for membase/mb to couchbase/cb

Change-Id: I1f16529ee53c1f4ee4caadac71a2583724788c95
  • Loading branch information...
2 parents 0ebe2a5 + 52d5db8 commit 6b7387c967a705ec0a128014737a0361e0209be0 Aliaksey Kandratsenka committed Dec 1, 2011
View
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Membase, Inc.
+# Copyright (c) 2011, Couchbase, Inc.
# All rights reserved.
SHELL=/bin/sh
@@ -40,7 +40,7 @@ dist:
mkdir -p tmp/ns_server-`git describe`
rm -rf tmp/ns_server-`git describe`/*
cp configure tmp/ns_server-`git describe`/
- cp -R LICENSE Makefile README* cluster* common* mb* membase* rebar* tmp/ns_server-`git describe`/
+ cp -R LICENSE Makefile README* cluster* common* cb* couchbase* rebar* tmp/ns_server-`git describe`/
cp -R deps doc etc include priv scripts src test tmp/ns_server-`git describe`/
find tmp/ns_server-`git describe` -name '*.beam' | xargs rm -f
tar -C tmp -czf ns_server-`git describe`.tar.gz ns_server-`git describe`
@@ -124,21 +124,21 @@ do-install:
cp -r deps/gen_smtp/ebin $(GEN_SMTP_LIBDIR)/
mkdir -p $(ALE_LIBDIR)
cp -r deps/ale/ebin $(ALE_LIBDIR)/
- mkdir -p $(DESTDIR)$(PREFIX)/etc/membase
+ mkdir -p $(DESTDIR)$(PREFIX)/etc/couchbase
sed -e 's|@DATA_PREFIX@|$(PREFIX_FOR_CONFIG)|g' -e 's|@BIN_PREFIX@|$(PREFIX_FOR_CONFIG)|g' \
- <etc/static_config.in >$(DESTDIR)$(PREFIX)/etc/membase/static_config
- touch $(DESTDIR)$(PREFIX)/etc/membase/config
+ <etc/static_config.in >$(DESTDIR)$(PREFIX)/etc/couchbase/static_config
+ touch $(DESTDIR)$(PREFIX)/etc/couchbase/config
mkdir -p $(DESTDIR)$(PREFIX)/bin/
- sed -e 's|@PREFIX@|$(DESTDIR)$(PREFIX)|g' <membase-server.sh.in >$(DESTDIR)$(PREFIX)/bin/membase-server
- sed -e 's|@PREFIX@|$(DESTDIR)$(PREFIX)|g' <mbbrowse_logs.in >$(DESTDIR)$(PREFIX)/bin/mbbrowse_logs
- cp mbcollect_info $(DESTDIR)$(PREFIX)/bin/mbcollect_info
- chmod +x $(DESTDIR)$(PREFIX)/bin/membase-server $(DESTDIR)$(PREFIX)/bin/mbbrowse_logs $(DESTDIR)$(PREFIX)/bin/mbcollect_info
- mkdir -p $(DESTDIR)$(PREFIX)/var/lib/membase/mnesia
- mkdir -p $(DESTDIR)$(PREFIX)/var/lib/membase/logs
- cp priv/init.sql $(DESTDIR)$(PREFIX)/etc/membase/
+ sed -e 's|@PREFIX@|$(DESTDIR)$(PREFIX)|g' <couchbase-server.sh.in >$(DESTDIR)$(PREFIX)/bin/couchbase-server
+ sed -e 's|@PREFIX@|$(DESTDIR)$(PREFIX)|g' <cbbrowse_logs.in >$(DESTDIR)$(PREFIX)/bin/cbbrowse_logs
+ cp cbcollect_info $(DESTDIR)$(PREFIX)/bin/cbcollect_info
+ chmod +x $(DESTDIR)$(PREFIX)/bin/couchbase-server $(DESTDIR)$(PREFIX)/bin/cbbrowse_logs $(DESTDIR)$(PREFIX)/bin/cbcollect_info
+ mkdir -p $(DESTDIR)$(PREFIX)/var/lib/couchbase/mnesia
+ mkdir -p $(DESTDIR)$(PREFIX)/var/lib/couchbase/logs
+ cp priv/init.sql $(DESTDIR)$(PREFIX)/etc/couchbase/
cp ebucketmigrator $(DESTDIR)$(PREFIX)/bin/ebucketmigrator
chmod +x $(DESTDIR)$(PREFIX)/bin/ebucketmigrator
- cp scripts/mbdumpconfig.escript $(DESTDIR)$(PREFIX)/bin/
+ cp scripts/cbdumpconfig.escript $(DESTDIR)$(PREFIX)/bin/
mkdir -p $(DESTDIR)$(PREFIX)/etc/couchdb/default.d
cp etc/capi.ini.in $(DESTDIR)$(PREFIX)/etc/couchdb/default.d/capi.ini
View
@@ -1,4 +1,4 @@
-# The Membase Server
+# The Couchbase Server
This application represents the top of the hierarchy of all memcached
smart services. It is an application in the Erlang OTP sense.
@@ -31,7 +31,7 @@ Before you start the server, you may need to do the following
## Running
After building everything via top level makefile you'll have
-membase-server script in your $REPO/install/bin (or other prefix if
+couchbase-server script in your $REPO/install/bin (or other prefix if
you specified so). You can run this script for normal single node
startup.
@@ -50,25 +50,25 @@ mode clusters it's port 9000 and higher. For production mode it's port
8091.
Other alternative is setting up and clustering nodes via REST
-API. membase-cli allows that. And you can easily write your own
+API. couchbase-cli allows that. And you can easily write your own
script(s).
There's ./cluster_connect script that eases cluster configuration for
development clusters. Ask --help.
Sometimes during debugging/development you want smaller number of
vbuckets. You can change vbuckets number by setting
-MEMBASE_NUM_VBUCKET environment variable to desired number of vbuckets
-before creating new membase bucket.
+COUCHBASE_NUM_VBUCKET environment variable to desired number of vbuckets
+before creating new couchbase bucket.
### Other tools
-Membase ships with a bunch of nice tools. Feel free to check
+Couchbase ships with a bunch of nice tools. Feel free to check
$REPO/install/bin (or $PREFIX/bin). One of notable tools is
mbstats. It allows you to query buckets for all kinds of internal
stats.
-Another notable tool is membase-cli. Script is called just membase.
+Another notable tool is couchbase-cli. Script is called just couchbase.
* * * * *
Copyright (c) 2011, Couchbase, Inc.
@@ -181,5 +181,5 @@ inside the value.
]}.
* * * * *
-Copyright (c) 2011, Membase, Inc.
+Copyright (c) 2011, Couchbase, Inc.
@@ -14,5 +14,5 @@ then
fi
exec erl -pa ebin -noshell -run ns_log_browser \
- -report_dir "@PREFIX@/var/lib/membase/logs" ${extra_args} \
+ -report_dir "@PREFIX@/var/lib/couchbase/logs" ${extra_args} \
-run init stop -- "$@"
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2011, Membase, Inc.
+# Copyright (c) 2011, Couchbase, Inc.
# All rights reserved.
progname=`basename $0`
@@ -51,7 +51,7 @@ class Task(object):
class TaskRunner(object):
- default_name = "membase.log"
+ default_name = "couchbase.log"
def __init__(self, verbosity=0):
self.files = {}
@@ -200,14 +200,16 @@ _tasks = [
WindowsTask("Physical memory", "wmic memphysical", reformat=True),
WindowsTask("Physical memory chip info", "wmic memorychip", reformat=True),
WindowsTask("Local storage devices", "wmic logicaldisk", reformat=True),
- WindowsTask("membase config",
- "escript.exe " + os.path.dirname(sys.argv[0]) + "/mbdumpconfig.escript " +
- os.path.dirname(sys.argv[0]) + "/../var/lib/membase/config/config.dat"),
+ WindowsTask("Couchbase config",
+ "escript.exe " + os.path.dirname(sys.argv[0]) + "/cbdumpconfig.escript " +
+ os.path.dirname(sys.argv[0]) + "/../var/lib/couchbase/config/config.dat"),
UnixTask("Filesystem", "df -ha"),
UnixTask("System activity reporter", "sar 1 10"),
UnixTask("System paging activity", "vmstat 1 10"),
UnixTask("System uptime", "uptime"),
UnixTask("couchbase user definition", "getent passwd couchbase"),
+ UnixTask("couchbase user limits", "su couchbase -c \"ulimit -a\"",
+ privileged=True),
UnixTask("membase user definition", "getent passwd membase"),
UnixTask("couchbase user limits", "su couchbase -c \"ulimit -a\"",
privileged=True),
@@ -220,7 +222,7 @@ _tasks = [
LinuxTask("System log", "cat /var/log/messages"),
UnixTask("Kernel log buffer", "dmesg"),
LinuxTask("couchbase config",
- os.path.dirname(sys.argv[0]) + "/mbdumpconfig.escript /opt/couchbase/var/lib/membase/config/config.dat"),
+ os.path.dirname(sys.argv[0]) + "/cbdumpconfig.escript /opt/couchbase/var/lib/couchbase/config/config.dat"),
AllOsTask("memcached stats all",
"mbstats -a 127.0.0.1:11210 all _admin _admin",
log_file="stats.log"),
@@ -242,7 +244,7 @@ _tasks = [
AllOsTask("memcached stats timings",
"mbstats -a 127.0.0.1:11210 timings _admin _admin",
log_file="stats.log"),
- AllOsTask("membase logs", "mbbrowse_logs", log_file="ns_server.log"),
+ AllOsTask("couchbase logs", "cbbrowse_logs", log_file="ns_server.log"),
LinuxTask("Couchdb log", "cat /var/log/couchdb/couch.log", log_file="couch.log"),
WindowsTask("Couchdb log",
"type " + os.path.dirname(sys.argv[0]) + "/../var/log/couchdb/couch.log",
View
@@ -61,7 +61,7 @@ EOF
sed -e "s|@couchdb_src_path@|${couchdb_src}/src/couchdb|g" <${0%"${0##*/}"}/rebar.config.in >${0%"${0##*/}"}/rebar.config
echo
-echo "Membase management server is configured and is ready to be built!"
+echo "ns_server is configured and is ready to be built!"
echo "PREFIX: ${prefix}"
echo "couchdb-src: ${couchdb_src}"
echo
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# Copyright (c) 2011, Couchbase, Inc.
+# Copyright (c) 2010-2011, Couchbase, Inc.
# All rights reserved
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,9 +32,9 @@ DEFAULT_CONFIG_FILE="@PREFIX@/etc/couchdb/default.ini"
LOCAL_CONFIG_DIR="@PREFIX@/etc/couchdb/local.d"
LOCAL_CONFIG_FILE="@PREFIX@/etc/couchdb/local.ini"
-PIDFILE="@PREFIX@/var/lib/membase/membase-server.pid"
-NODEFILE="@PREFIX@/var/lib/membase/membase-server.node"
-COOKIEFILE="@PREFIX@/var/lib/membase/membase-server.cookie"
+PIDFILE="@PREFIX@/var/lib/couchbase/couchbase-server.pid"
+NODEFILE="@PREFIX@/var/lib/couchbase/couchbase-server.node"
+COOKIEFILE="@PREFIX@/var/lib/couchbase/couchbase-server.cookie"
couch_start_arguments=""
@@ -48,7 +48,7 @@ _check_nofile () {
if [ `ulimit -n` -lt 10240 ]
then
cat <<EOF
-The maximum number of open files for the membase user is set too low.
+The maximum number of open files for the couchbase user is set too low.
It must be at least 10240. Normally this can be increased by adding
the following lines to /etc/security/limits.conf:
@@ -61,7 +61,7 @@ EOF
}
_prepare_datadir () {
- datadir="@PREFIX@/var/lib/membase"
+ datadir="@PREFIX@/var/lib/couchbase"
test -d "$datadir" || mkdir -p "$datadir"
cd "$datadir"
@@ -124,7 +124,7 @@ _start() {
$* \
-run ns_bootstrap -- \
-couch_ini $couch_start_arguments \
- -ns_server config_path "\"@PREFIX@/etc/membase/static_config\"" \
+ -ns_server config_path "\"@PREFIX@/etc/couchbase/static_config\"" \
-ns_server pidfile "\"$PIDFILE\"" \
-ns_server nodefile "\"$NODEFILE\"" \
-ns_server cookiefile "\"$COOKIEFILE\""
@@ -1,11 +1,11 @@
-{error_logger_mf_dir, "@DATA_PREFIX@/var/lib/membase/logs"}.
+{error_logger_mf_dir, "@DATA_PREFIX@/var/lib/couchbase/logs"}.
{error_logger_mf_maxbytes, 10485760}.
{error_logger_mf_maxfiles, 20}.
{path_config_bindir, "@BIN_PREFIX@/bin"}.
-{path_config_etcdir, "@BIN_PREFIX@/etc/membase"}.
+{path_config_etcdir, "@BIN_PREFIX@/etc/couchbase"}.
{path_config_libdir, "@BIN_PREFIX@/lib"}.
-{path_config_datadir, "@DATA_PREFIX@/var/lib/membase"}.
-{path_config_tmpdir, "@DATA_PREFIX@/var/lib/membase/tmp"}.
+{path_config_datadir, "@DATA_PREFIX@/var/lib/couchbase"}.
+{path_config_tmpdir, "@DATA_PREFIX@/var/lib/couchbase/tmp"}.
{loglevel_default, info}.
{loglevel_couchdb, info}.
{loglevel_ns_server, info}.
View
@@ -1,4 +1,4 @@
--- Initialization parameters for sqlite backend for membase buckets.
+-- Initialization parameters for sqlite backend for membase/couchbase buckets.
pragma auto_vacuum = none;
pragma journal_mode = WAL;
pragma read_uncommitted = true;
@@ -1,5 +1,4 @@
-
-/* Membase Menelaus Web Console */
+/* Couchbase Menelaus Web Console */
/* begin ultimate reset */
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code, del, dfn, em, font, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center,
@@ -20,7 +20,7 @@
%%
%% @doc Dump a config.dat file to stdout.
%%
-%% mbdumpconfig.escript [options]
+%% cbdumpconfig.escript [options]
%%
%% The options can be used to filter the output. These include:
%%
@@ -29,15 +29,15 @@
%%
%% Examples:
%% linux:
-%% ./bin/mbdumpconfig.escript var/lib/membase/config/config.dat
+%% ./bin/cbdumpconfig.escript var/lib/couchbase/config/config.dat
%% windows:
-%% bin\erlang\escript bin\mbdumpconfig.escript var\lib\membase\config\config.dat
+%% bin\erlang\escript bin\cbdumpconfig.escript var\lib\couchbase\config\config.dat
%%
%% Example of dumping info for a particular node...
-%% mbdumpconfig.escript config.dat node ns_1@127.0.0.1
+%% cbdumpconfig.escript config.dat node ns_1@127.0.0.1
%%
%% Example of dumping buckets names of type membase...
-%% mbdumpconfig.escript config.dat buckets membase
+%% cbdumpconfig.escript config.dat buckets membase
main([Path]) ->
Config = read(Path),
@@ -49,7 +49,7 @@
%% Whether to enable or disable email notifications
enabled=false :: true|false,
%% The sender address of the email
- sender="membase@localhost" :: string(),
+ sender="couchbase@localhost" :: string(),
%% A comma separated list of recipients of the of the alert emails.
recipients=[] :: [string()],
%% Host address of the SMTP server
@@ -44,7 +44,7 @@ require_auth(Req) ->
Req:respond({401, add_header(), []});
_ ->
Req:respond({401, [{"WWW-Authenticate",
- "Basic realm=\"Membase Server Admin / REST\""} | add_header()],
+ "Basic realm=\"Couchbase Server Admin / REST\""} | add_header()],
[]})
end.
@@ -42,14 +42,14 @@ start_link() ->
case Result of
{ok, _Pid} ->
?user_log(?START_OK,
- "Membase Server has started on web port ~p on node ~p.",
+ "Couchbase Server has started on web port ~p on node ~p.",
[Port, node()]);
_Err ->
%% The exact error message is not logged here since this
%% is a supervisor start, but a more helpful message
%% should've been logged before.
?user_log(?START_FAIL,
- "Membase Server has failed to start on web port ~p on node ~p. " ++
+ "Couchbase Server has failed to start on web port ~p on node ~p. " ++
"Perhaps another process has taken port ~p already? " ++
"If so, please stop that process first before trying again.",
[Port, node(), Port])
@@ -557,6 +557,7 @@ basic_bucket_params_screening_tail(IsNew, BucketName, Params, BucketConfig, Auth
case proplists:get_value("bucketType", Params) of
"memcached" -> memcached;
"membase" -> membase;
+ "couchbase" -> membase;
undefined -> membase;
_ -> invalid
end
@@ -1,5 +1,5 @@
-%% @author Northscale <info@northscale.com>
-%% @copyright 2010 NorthScale, Inc.
+%% @author Couchbase <info@couchbase.com>
+%% @copyright 2010, 2011 Couchbase, Inc.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
%% limitations under the License.
%%
{application, ns_server,
- [{description, "Membase server"},
+ [{description, "Couchbase server"},
{vsn, "0.0.0"},
{modules, [misc,
ns_config,
View
@@ -88,7 +88,7 @@ joiners-remove:
# Helper targets for common membase-cli commands.
#
-MEMBASE_CLI=../../membase-cli/membase
+MEMBASE_CLI=../../membase-cli/couchbase
MANAGEMENT=../../ep-engine/management
REST_USER=Administrator

0 comments on commit 6b7387c

Please sign in to comment.