diff options
author | Jan Lehnardt <jan@apache.org> | 2017-06-03 11:46:34 +0200 |
---|---|---|
committer | Jan Lehnardt <jan@apache.org> | 2017-06-03 11:46:34 +0200 |
commit | b2b93c17754cb4169bf9e922d9be702eb6d0f0d5 (patch) | |
tree | 5dfb8db97b91a397903cb0bf5c17258252c32bd2 | |
parent | 2590fbcc0ecbe854404edae751514d1fd20b07e4 (diff) | |
parent | d75693ea94de8595b69fcf8e9eb189664e115574 (diff) | |
download | couchdb-b2b93c17754cb4169bf9e922d9be702eb6d0f0d5.tar.gz |
Merge remote-tracking branch 'adrienverge/COUCHDB-3119'
* adrienverge/COUCHDB-3119:
add_node: Don't fail if node name != "couchdb" or "node1"
-rw-r--r-- | README.md | 3 | ||||
-rw-r--r-- | src/setup.erl | 8 | ||||
-rw-r--r-- | src/setup_httpd.erl | 3 | ||||
-rwxr-xr-x | test/t-frontend-setup.sh | 2 | ||||
-rwxr-xr-x | test/t.sh | 2 |
5 files changed, 10 insertions, 8 deletions
@@ -88,7 +88,8 @@ UI shows an “Add Node” interface with the fields admin, and node: "username":"username", "password":"password", "host":"192.168.1.100", - "port": 5984 + ["port": 5984], + "name": "node1" // as in “node1@hostname”, same as in vm.args } ``` diff --git a/src/setup.erl b/src/setup.erl index e58c32d4a..acbeb2d78 100644 --- a/src/setup.erl +++ b/src/setup.erl @@ -209,13 +209,14 @@ add_node_int(Options, ok) -> Host = proplists:get_value(host, Options), Port = get_port(proplists:get_value(port, Options, 5984)), + Name = proplists:get_value(name, Options, get_default_name(Port)), Url = binary_to_list(<<"http://", Host/binary, ":", Port/binary, "/_cluster_setup">>), case ibrowse:send_req(Url, Headers, post, Body, RequestOptions) of {ok, "201", _, _} -> % when done, PUT :5986/nodes/nodeB - create_node_doc(Host, Port); + create_node_doc(Host, Name); Else -> couch_log:notice("send_req: ~p~n", [Else]), Else @@ -228,16 +229,15 @@ get_port(Port) when is_list(Port) -> get_port(Port) when is_binary(Port) -> Port. -create_node_doc(Host, Port) -> +create_node_doc(Host, Name) -> {ok, Db} = couch_db:open_int(<<"_nodes">>, []), - Name = get_name(Port), Doc = {[{<<"_id">>, <<Name/binary, "@", Host/binary>>}]}, Options = [], CouchDoc = couch_doc:from_json_obj(Doc), couch_db:update_doc(Db, CouchDoc, Options). -get_name(Port) -> +get_default_name(Port) -> case Port of % shortcut for easier development <<"15984">> -> diff --git a/src/setup_httpd.erl b/src/setup_httpd.erl index 73fa4ee38..73ce147e3 100644 --- a/src/setup_httpd.erl +++ b/src/setup_httpd.erl @@ -88,7 +88,8 @@ handle_action("add_node", Setup) -> {username, <<"username">>}, {password, <<"password">>}, {host, <<"host">>}, - {port, <<"port">>} + {port, <<"port">>}, + {name, <<"name">>} ], Setup), case setup:add_node(Options) of {error, cluster_not_enabled} -> diff --git a/test/t-frontend-setup.sh b/test/t-frontend-setup.sh index 74743bb76..52056a374 100755 --- a/test/t-frontend-setup.sh +++ b/test/t-frontend-setup.sh @@ -22,7 +22,7 @@ curl a:b@127.0.0.1:15984/_cluster_setup -d '{"action":"enable_cluster","username curl a:b@127.0.0.1:15984/_cluster_setup -d '{"action":"enable_cluster","remote_node":"127.0.0.1","port":"25984","remote_current_user":"a","remote_current_password":"b","username":"foo","password":"baz","bind_address":"0.0.0.0","node_count":2}' $HEADERS # Add node B on node A -curl a:b@127.0.0.1:15984/_cluster_setup -d '{"action":"add_node","username":"foo","password":"baz","host":"127.0.0.1","port":25984}' $HEADERS +curl a:b@127.0.0.1:15984/_cluster_setup -d '{"action":"add_node","username":"foo","password":"baz","host":"127.0.0.1","port":25984,"name":"node2"}' $HEADERS # Show cluster state: curl a:b@127.0.0.1:15986/_nodes/_all_docs @@ -22,7 +22,7 @@ curl a:b@127.0.0.1:15984/_cluster_setup -d '{"action":"enable_cluster","username curl a:b@127.0.0.1:25984/_cluster_setup -d '{"action":"enable_cluster","username":"foo","password":"baz","bind_address":"0.0.0.0","node_count":2}' $HEADERS # Add node B on node A -curl a:b@127.0.0.1:15984/_cluster_setup -d '{"action":"add_node","username":"foo","password":"baz","host":"127.0.0.1","port":25984}' $HEADERS +curl a:b@127.0.0.1:15984/_cluster_setup -d '{"action":"add_node","username":"foo","password":"baz","host":"127.0.0.1","port":25984,"name":"node2"}' $HEADERS # Show cluster state: curl a:b@127.0.0.1:15986/_nodes/_all_docs |