Anonymous avatar Anonymous committed eee5de1

Update docs to get rid of doorbell port mentions.

HG: changed doc/basic-setup.txt

Comments (0)

Files changed (4)

doc/basic-client.txt

 
 To talk to riak, all you need is an Erlang node with riak/ebin in its 
 code path.  Once this shell is up,
-use riak:client_connect/3 to get connected.  The client returned from
+use riak:client_connect/1 to get connected.  The client returned from
 client_connect is defined by the riak_client module, and supports the
 simple functions get, put, delete, and others.
 
 Riak client nodes must use "long names" and have riak/ebin in their
 code path.  The easiest way to start a node of this nature is:
 
-$ erl -name myclient@127.0.0.1 -pa $PATH_TO_RIAK/ebin 
+$ erl -name myclient@127.0.0.1 -setcookie cookie -pa $PATH_TO_RIAK/ebin 
 
 You'll know you've done this correctly if you can execute the
 following commands and get a path to a beam file, instead of the atom
 Connecting
 ---
 
-Once you have your node running, pass your Riak server's IP, port, and
-cookie to riak:client_connect/3 to connect and get a client.  This can
+Once you have your node running, pass your Riak server nodename
+to riak:client_connect/1 to connect and get a client.  This can
 be as simple as:
 
-3> {ok, Client} = riak:client_connect("127.0.0.1", 9000, mycookie).
-{ok,{riak_client,'riak@127.0.0.1',
-                 "20090722141126-myclient@127.0.0.1-riak@127.0.0.1-928359"}}
+3> {ok, Client} = riak:client_connect('riak@127.0.0.1').
+{ok,{riak_client,'riak@127.0.0.1', <<1,112,224,226>>}}
 
 
 Storing New Data
 happen if you just fired up a new client, and overwrote the existing
 list with a new one?
 
-1> {ok, C} = riak:client_connect("127.0.0.1", 9000, mycookie).
+1> {ok, C} = riak:client_connect('riak@127.0.0.1').
 ...
 2> ok = C:put(riak_object:new(<<"groceries">>, <<"mine">>, ["bread","cheese"]), 1).
 ...
  {allow_mult,true},
  {linkfun,{no_mod,no_fun}},
  {old_vclock,86400},
- {young_vclock,21600},
+ {young_vclock,20},
  {big_vclock,50},
  {small_vclock,10}]
 
 new client.
 
 
-riak:client_connect/3 returns {error,timeout}
+riak:client_connect/1 returns {error,timeout}
 -
 
-This riak cluster is probably down.  It may also just be overloaded,
-but it's more likely down.
+The Riak node you are connecting to is down.
 
 
 {error,notfound}

doc/basic-mapreduce.txt

 
 - If you need to do a Riak 'get' inside of a map or reduce function,
   you can use riak:local_client/0 to get a Riak client instead of
-  riak:client_connect/3.  The code is already running on a connected
-  node -- there's no need to go through the doorbell/connect
-  proceedure.
+  riak:client_connect/1.
 
 - Your map and reduce functions are running on a Riak node, which
   means that that Riak node is spending CPU time doing something other

doc/basic-setup.txt

   The name of the cluster.  Can be anything.  Used mainly in saving
   ring configuration.  All nodes should have the same cluster name.
 
-doorbell_port: integer
-  Network port on which this node will listen for connections from
-  clients and other nodes.
-
 gossip_interval: integer
   The period, in milliseconds, at which ring state gossiping will
   happen.  A good default is 60000 (sixty seconds).  Best not to
 {ring_state_dir, "priv/ringstate"}.
 {ring_creation_size, 16}.
 {gossip_interval, 60000}.
-{doorbell_port, 9000}.
 {storage_backend, riak_fs_backend}.
 {riak_fs_backend_root, "/var/riak/store"}.
 {riak_cookie, default_riak_cookie}.
 
 1. cd /usr/local/riak
 2. cp config/riak.erlenv config/riak2.erlenv
-3. Edit riak2.erlenv, and change doorbell_port, riak_fs_backend_root,
+3. Edit riak2.erlenv, and change riak_fs_backend_root
    and riak_nodename to something unique.
-3. ./start-join config/riak2.erlenv 127.0.0.1 9000
+3. ./start-join config/riak2.erlenv riak@127.0.0.1
 
 That node will also start and background itself.  You cluster will
 still be ready to accept requests, with no further changes.
 {ring_state_dir, "priv/ringstate"}.
 {ring_creation_size, 1024}.
 {gossip_interval, 60000}.
-{doorbell_port, 9000}.
 {storage_backend, riak_fs_backend}.
 {riak_fs_backend_root, "/var/riak/store"}.
 {riak_cookie, default_riak_cookie}.
 1. Install Riak on another host.
 2. Copy riak.erlenv from your original host to the new host.
 3. Edit riak.erlenv and change riak_hostname to match the new host.
-4. ./start-join config/riak.erlenv prod0.domain.net 9000
+4. ./start-join config/riak.erlenv riak@prod0.domain.net
 
 That node will also start and background itself.  You cluster will
 still be ready to accept requests, with no further changes.
 
-Notice that there is no need to change doorbell_port,
-riak_fs_backend_port, or riak_nodename on the new host, because they
-won't conflict with those settings on the original host, unlike the
-development configuration.
+Notice that there is no need to change riak_fs_backend_root, or
+riak_nodename on the new host, because they won't conflict with 
+those settings on the original host, unlike the development configuration.
 
 
 Logging
 
 Riak doesn't do any persistent logging in the default configuration.
 Instead, logging can be "enabled" and "disabled" by connecting and
-disconnecting an "eventer".  Eventers will be described more fully in
-another document, but this simple steps for starting the default
-logging eventer are:
+disconnecting an "eventer".  Eventers are described more fully in
+the riak_eventer module documentation, but this simple steps for starting 
+the default logging eventer are:
 
 1. cd /usr/local/riak
-2. ./start-eventer.sh default default_riak_cookie 127.0.0.1 9000 \
-   evt riak_event_logger /tmp/riakevt.log
+2. ./start-logger.sh node@hostname cookie filename
+   Filename can be left blank to log to stdout.
 
-That command will start and Erlang node, named 'evt' that will stay
-running.  It will connect to the cluster "default" at 127.0.0.1:9000,
-with Erlang cookie 'default_riak_cookie'.  It will then begin spewing
-data into /tmp/riakevt.log.  Use 'tail -F /tmp/riakevt.log' to watch
-it fly by.  Note that it is not recommended that you connect this
+This command will start an Erlang node, named riak_logger@localhost,
+that will stay running. It will connect to the cluster through the
+specified node, and attach an eventer to the cluster. The eventer will
+capture all events about the system and either dump them to the provided file,
+or print them to the screen.
+
+Note that it is not recommended that you connect this
 particular logger to an active production cluster, as it generates a
 *lot* of data, and has no provision for things like log file rollover.

src/riak_bucket.erl

      {linkfun,{modfun, jiak_object, mapreduce_linkfun}},
      {chash_keyfun, {riak_util, chash_std_keyfun}},
      {old_vclock, 86400},
-     {young_vclock, 21600},
+     {young_vclock, 20},
      {big_vclock, 50},
      {small_vclock, 10}].
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.