Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Path renames for membase/mb to couchbase/cb

Change-Id: Ic19ceda85bce78fd2ca228422402db9114d9e253
Reviewed-on: http://review.couchbase.org/11068
Reviewed-by: Bin Cui <bin.cui@gmail.com>
Tested-by: Steve Yen <steve.yen@gmail.com>
  • Loading branch information...
commit 25df42aafdfb6f99baec764211a70d9bc27df9cb 1 parent 4925ee0
@steveyen steveyen authored
View
26 Makefile
@@ -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`
@@ -114,21 +114,21 @@ do-install:
cp -r deps/gen_smtp/ebin $(GEN_SMTP_LIBDIR)/
mkdir -p $(MOCHIWEB_LIBDIR)
cp -r deps/mochiweb/ebin $(MOCHIWEB_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/
clean clean_all:
@(cd deps/gen_smtp && $(MAKE) clean)
View
14 README.markdown
@@ -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,7 +50,7 @@ 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
@@ -58,17 +58,17 @@ 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.
View
2  README_multinode.markdown
@@ -181,5 +181,5 @@ inside the value.
]}.
* * * * *
-Copyright (c) 2011, Membase, Inc.
+Copyright (c) 2011, Couchbase, Inc.
View
2  mbbrowse_logs.in → cbbrowse_logs.in
@@ -8,4 +8,4 @@ export PATH
ERL_LIBS="@PREFIX@/lib/couchdb/erlang/lib:@PREFIX@/lib/ns_server/erlang/lib"
export ERL_LIBS
-exec erl -pa ebin -boot start_sasl -sasl errlog_type error -noshell -run ns_log_browser -report_dir "@PREFIX@/var/lib/membase/logs" -run init stop -- "$@"
+exec erl -pa ebin -boot start_sasl -sasl errlog_type error -noshell -run ns_log_browser -report_dir "@PREFIX@/var/lib/couchbase/logs" -run init stop -- "$@"
View
2  mbbrowse_logs_cluster → cbbrowse_logs_cluster
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright (c) 2011, Membase, Inc.
+# Copyright (c) 2011, Couchbase, Inc.
# All rights reserved.
cd `dirname $0`
exec erl -pa ebin -boot start_sasl -sasl errlog_type error -noshell -run ns_log_browser -report_dir logs/"$1" -run init stop -- "$@"
View
21 mbcollect_info → cbcollect_info
@@ -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 = {}
@@ -150,7 +150,7 @@ _tasks = [
WindowsTask("Computer system", "wmic computersystem", reformat=True),
WindowsTask("Computer OS", "wmic os", reformat=True),
UnixTask("Directory structure",
- "ls -lR /opt/membase /var/membase /etc/opt/membase"),
+ "ls -lR /opt/couchbase /opt/membase /var/membase /etc/opt/membase"),
SolarisTask("Process list snapshot", "prstat -a -c -n 100 -t -v -L 1 10"),
SolarisTask("Process list", "ps -ef"),
SolarisTask("Service configuration", "svcs -a"),
@@ -198,13 +198,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("membase user limits", "su membase -c \"ulimit -a\"",
privileged=True),
@@ -214,8 +217,8 @@ _tasks = [
LinuxTask("System log", "cat /var/log/syslog"),
LinuxTask("System log", "cat /var/log/messages"),
UnixTask("Kernel log buffer", "dmesg"),
- LinuxTask("membase config",
- os.path.dirname(sys.argv[0]) + "/mbdumpconfig.escript /opt/membase/var/lib/membase/config/config.dat"),
+ LinuxTask("couchbase config",
+ 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"),
@@ -237,7 +240,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"),
]
@@ -259,7 +262,7 @@ def main():
'/sbin',
'/usr/bin',
'/usr/sbin',
- '/opt/membase/bin',
+ '/opt/couchbase/bin',
erldir,
os.environ['PATH']]
os.environ['PATH'] = ':'.join(path)
View
2  configure
@@ -47,6 +47,6 @@ prefix=$prefix
EOF
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
View
14 membase-server.sh.in → couchbase-server.sh.in
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# Copyright (c) 2010, Membase, Inc.
+# Copyright (c) 2010-2011, Couchbase, Inc.
# All rights reserved
#
PATH="@PREFIX@/bin":$PATH
@@ -9,18 +9,18 @@ export PATH
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:
-membase soft nofile <value>
-membase hard nofile <value>
+couchbase soft nofile <value>
+couchbase hard nofile <value>
Where <value> is greater than 10240.
EOF
fi
-datadir="@PREFIX@/var/lib/membase"
+datadir="@PREFIX@/var/lib/couchbase"
test -d "$datadir" || mkdir -p "$datadir"
cd "$datadir"
@@ -53,5 +53,5 @@ exec erl \
-kernel inet_dist_listen_min 21100 inet_dist_listen_max 21299 \
$* \
-run ns_bootstrap -- \
- -ns_server config_path "\"@PREFIX@/etc/membase/static_config\"" \
- -ns_server pidfile "\"@PREFIX@/var/lib/membase/membase-server.pid\""
+ -ns_server config_path "\"@PREFIX@/etc/couchbase/static_config\"" \
+ -ns_server pidfile "\"@PREFIX@/var/lib/couchbase/couchbase-server.pid\""
View
8 etc/static_config.in
@@ -1,8 +1,8 @@
-{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"}.
View
2  priv/init.sql
@@ -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;
View
10 scripts/mbdumpconfig.escript → scripts/cbdumpconfig.escript
@@ -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),
Please sign in to comment.
Something went wrong with that request. Please try again.