Updated Branches: refs/heads/1994-merge-rcouch 5a865ac63 -> 9e590a68f
couch_index_sup should be started by the couch application I had this patch landing in a custommer repository for awhile. Since couch_index is always dependent of couch it's better to add it to the couch application supervision rather than on its own. Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/9e590a68 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/9e590a68 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/9e590a68 Branch: refs/heads/1994-merge-rcouch Commit: 9e590a68fce6e923d5d3a612ed4154f99526f515 Parents: 5a865ac Author: Benoit Chesneau <[email protected]> Authored: Thu Jan 9 23:29:54 2014 +0100 Committer: Benoit Chesneau <[email protected]> Committed: Thu Jan 9 23:29:54 2014 +0100 ---------------------------------------------------------------------- src/apps/couch/src/couch.app.src.script | 3 ++- src/apps/couch/src/couch_primary_sup.erl | 8 ++++++- src/apps/couch_index/src/couch_index.app.src | 3 +-- src/apps/couch_index/src/couch_index_app.erl | 27 ---------------------- src/apps/couch_mrview/test/02-map-views.t | 2 -- src/apps/couch_mrview/test/03-red-views.t | 1 - src/apps/couch_mrview/test/04-index-info.t | 1 - src/apps/couch_mrview/test/05-collation.t | 1 - src/apps/couch_mrview/test/06-all-docs.t | 1 - src/apps/couch_mrview/test/07-compact-swap.t | 1 - src/test/etap/072-cleanup.t | 1 - src/test/etap/076-file-compression.t | 1 - src/test/etap/150-invalid-view-seq.t | 4 ---- src/test/etap/160-vhosts.t | 1 - src/test/etap/200-view-group-no-db-leaks.t | 1 - src/test/etap/201-view-group-shutdown.t | 1 - src/test/etap/220-compaction-daemon.t | 1 - src/test/etap/250-upgrade-legacy-view-files.t | 1 - 18 files changed, 10 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/apps/couch/src/couch.app.src.script ---------------------------------------------------------------------- diff --git a/src/apps/couch/src/couch.app.src.script b/src/apps/couch/src/couch.app.src.script index c947ead..c406e02 100644 --- a/src/apps/couch/src/couch.app.src.script +++ b/src/apps/couch/src/couch.app.src.script @@ -48,6 +48,7 @@ end, couch_db_update, couch_db_update_notifier_sup, couch_external_manager, + couch_index_sup, couch_httpd, couch_log, couch_primary_services, @@ -62,6 +63,6 @@ end, {mod, {couch_app, []}}, {env, [{couch_rel, RelVsn}]}, {applications, [kernel, stdlib, crypto, sasl, asn1, public_key, ssl, - inets, oauth, ibrowse, mochiweb, os_mon]} + inets, ibrowse, os_mon]} ]} ]. http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/apps/couch/src/couch_primary_sup.erl ---------------------------------------------------------------------- diff --git a/src/apps/couch/src/couch_primary_sup.erl b/src/apps/couch/src/couch_primary_sup.erl index 7c4fde2..d05cad0 100644 --- a/src/apps/couch/src/couch_primary_sup.erl +++ b/src/apps/couch/src/couch_primary_sup.erl @@ -42,7 +42,13 @@ init([]) -> permanent, brutal_kill, worker, - [couch_log]} + [couch_log]}, + {couch_index_sup, + {couch_index_sup, start_link, []}, + permanent, + infinity, + supervisor, + [couch_index_sup]} ], {ok, {{one_for_one, 10, 3600}, Children}}. http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/apps/couch_index/src/couch_index.app.src ---------------------------------------------------------------------- diff --git a/src/apps/couch_index/src/couch_index.app.src b/src/apps/couch_index/src/couch_index.app.src index 6a59e99..921e5d2 100644 --- a/src/apps/couch_index/src/couch_index.app.src +++ b/src/apps/couch_index/src/couch_index.app.src @@ -15,6 +15,5 @@ {vsn, "1.3.0"}, {modules, []}, {registered, [couch_index_server]}, - {applications, [kernel, stdlib, couch]}, - {mod, {couch_index_app, []}} + {applications, [kernel, stdlib, couch]} ]}. http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/apps/couch_index/src/couch_index_app.erl ---------------------------------------------------------------------- diff --git a/src/apps/couch_index/src/couch_index_app.erl b/src/apps/couch_index/src/couch_index_app.erl deleted file mode 100644 index 6bafdcb..0000000 --- a/src/apps/couch_index/src/couch_index_app.erl +++ /dev/null @@ -1,27 +0,0 @@ -% Licensed under the Apache License, Version 2.0 (the "License"); you may not -% use this file except in compliance with the License. You may obtain a copy of -% the License at -% -% http://www.apache.org/licenses/LICENSE-2.0 -% -% Unless required by applicable law or agreed to in writing, software -% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the -% License for the specific language governing permissions and limitations under -% the License. - --module(couch_index_app). - --behaviour(application). - --include_lib("couch/include/couch_db.hrl"). - --export([start/2, stop/1]). - -start(_Type, _Args) -> - couch_util:start_app_deps(couch_index), - couch_index_sup:start_link(). - - -stop(_) -> - ok. http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/apps/couch_mrview/test/02-map-views.t ---------------------------------------------------------------------- diff --git a/src/apps/couch_mrview/test/02-map-views.t b/src/apps/couch_mrview/test/02-map-views.t index ed1b1cc..567042d 100644 --- a/src/apps/couch_mrview/test/02-map-views.t +++ b/src/apps/couch_mrview/test/02-map-views.t @@ -30,8 +30,6 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), - couch_index_sup:start_link(), - {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map), test_basic(Db), http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/apps/couch_mrview/test/03-red-views.t ---------------------------------------------------------------------- diff --git a/src/apps/couch_mrview/test/03-red-views.t b/src/apps/couch_mrview/test/03-red-views.t index 17b9148..7f52f75 100644 --- a/src/apps/couch_mrview/test/03-red-views.t +++ b/src/apps/couch_mrview/test/03-red-views.t @@ -20,7 +20,6 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), - couch_index_sup:start_link(), {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, red), http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/apps/couch_mrview/test/04-index-info.t ---------------------------------------------------------------------- diff --git a/src/apps/couch_mrview/test/04-index-info.t b/src/apps/couch_mrview/test/04-index-info.t index 73c4dcc..834b7d2 100644 --- a/src/apps/couch_mrview/test/04-index-info.t +++ b/src/apps/couch_mrview/test/04-index-info.t @@ -32,7 +32,6 @@ sig() -> <<"276df562b152b3c4e5d34024f62672ed">>. test() -> couch_server_sup:start_link(test_util:config_files()), - couch_index_sup:start_link(), {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map), couch_mrview:query_view(Db, <<"_design/bar">>, <<"baz">>), http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/apps/couch_mrview/test/05-collation.t ---------------------------------------------------------------------- diff --git a/src/apps/couch_mrview/test/05-collation.t b/src/apps/couch_mrview/test/05-collation.t index d476601..f98e88d 100644 --- a/src/apps/couch_mrview/test/05-collation.t +++ b/src/apps/couch_mrview/test/05-collation.t @@ -20,7 +20,6 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), - couch_index_sup:start_link(), {ok, Db0} = couch_mrview_test_util:new_db(<<"foo">>, map), {ok, Db1} = couch_mrview_test_util:save_docs(Db0, docs()), http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/apps/couch_mrview/test/06-all-docs.t ---------------------------------------------------------------------- diff --git a/src/apps/couch_mrview/test/06-all-docs.t b/src/apps/couch_mrview/test/06-all-docs.t index a19cd7e..370825e 100644 --- a/src/apps/couch_mrview/test/06-all-docs.t +++ b/src/apps/couch_mrview/test/06-all-docs.t @@ -20,7 +20,6 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), - couch_index_sup:start_link(), {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map), http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/apps/couch_mrview/test/07-compact-swap.t ---------------------------------------------------------------------- diff --git a/src/apps/couch_mrview/test/07-compact-swap.t b/src/apps/couch_mrview/test/07-compact-swap.t index a74d273..f7ebca2 100644 --- a/src/apps/couch_mrview/test/07-compact-swap.t +++ b/src/apps/couch_mrview/test/07-compact-swap.t @@ -21,7 +21,6 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), - couch_index_sup:start_link(), {ok, Db} = couch_mrview_test_util:init_db(<<"foo">>, map, 1000), couch_mrview:query_view(Db, <<"_design/bar">>, <<"baz">>), http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/test/etap/072-cleanup.t ---------------------------------------------------------------------- diff --git a/src/test/etap/072-cleanup.t b/src/test/etap/072-cleanup.t index 6179145..dd4484f 100755 --- a/src/test/etap/072-cleanup.t +++ b/src/test/etap/072-cleanup.t @@ -41,7 +41,6 @@ main(_) -> test() -> {ok, _} = couch_server_sup:start_link(test_util:config_files()), - {ok, _} = couch_index_sup:start_link(), couch_server:delete(?TEST_DB, []), timer:sleep(1000), http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/test/etap/076-file-compression.t ---------------------------------------------------------------------- diff --git a/src/test/etap/076-file-compression.t b/src/test/etap/076-file-compression.t index 14dd9d5..fb15fad 100755 --- a/src/test/etap/076-file-compression.t +++ b/src/test/etap/076-file-compression.t @@ -40,7 +40,6 @@ main(_) -> test() -> {ok, _} = couch_server_sup:start_link(test_util:config_files()), - {ok, _} = couch_index_sup:start_link(), couch_config:set("couchdb", "file_compression", "none", false), http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/test/etap/150-invalid-view-seq.t ---------------------------------------------------------------------- diff --git a/src/test/etap/150-invalid-view-seq.t b/src/test/etap/150-invalid-view-seq.t index b6001f6..6db0b7d 100755 --- a/src/test/etap/150-invalid-view-seq.t +++ b/src/test/etap/150-invalid-view-seq.t @@ -41,9 +41,6 @@ main(_) -> %% test() -> couch_server_sup:start_link(test_util:config_files()), - {ok, Pid} = couch_index_sup:start_link(), - unlink(Pid), - timer:sleep(1000), delete_db(), create_db(), @@ -166,7 +163,6 @@ restore_backup_db_file() -> ok = file:delete(DbFile), ok = file:rename(DbFile ++ ".backup", DbFile), couch_server_sup:start_link(test_util:config_files()), - couch_index_sup:start_link(), timer:sleep(1000), put(port, integer_to_list(mochiweb_socket_server:get(couch_httpd, port))), ok. http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/test/etap/160-vhosts.t ---------------------------------------------------------------------- diff --git a/src/test/etap/160-vhosts.t b/src/test/etap/160-vhosts.t index fc79121..15b2542 100755 --- a/src/test/etap/160-vhosts.t +++ b/src/test/etap/160-vhosts.t @@ -43,7 +43,6 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), - couch_index_sup:start_link(), ibrowse:start(), crypto:start(), http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/test/etap/200-view-group-no-db-leaks.t ---------------------------------------------------------------------- diff --git a/src/test/etap/200-view-group-no-db-leaks.t b/src/test/etap/200-view-group-no-db-leaks.t index afaaa8e..409a99f 100755 --- a/src/test/etap/200-view-group-no-db-leaks.t +++ b/src/test/etap/200-view-group-no-db-leaks.t @@ -67,7 +67,6 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), - couch_index_sup:start_link(), timer:sleep(1000), put(addr, couch_config:get("httpd", "bind_address", "127.0.0.1")), http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/test/etap/201-view-group-shutdown.t ---------------------------------------------------------------------- diff --git a/src/test/etap/201-view-group-shutdown.t b/src/test/etap/201-view-group-shutdown.t index b4927fa..ae3f063 100755 --- a/src/test/etap/201-view-group-shutdown.t +++ b/src/test/etap/201-view-group-shutdown.t @@ -68,7 +68,6 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), - couch_index_sup:start_link(), ok = couch_config:set("couchdb", "max_dbs_open", "3", false), ok = couch_config:set("couchdb", "delayed_commits", "false", false), crypto:start(), http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/test/etap/220-compaction-daemon.t ---------------------------------------------------------------------- diff --git a/src/test/etap/220-compaction-daemon.t b/src/test/etap/220-compaction-daemon.t index 7f3f43b..fe032e8 100755 --- a/src/test/etap/220-compaction-daemon.t +++ b/src/test/etap/220-compaction-daemon.t @@ -38,7 +38,6 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), - couch_index_sup:start_link(), timer:sleep(1000), put(addr, couch_config:get("httpd", "bind_address", "127.0.0.1")), put(port, integer_to_list(mochiweb_socket_server:get(couch_httpd, port))), http://git-wip-us.apache.org/repos/asf/couchdb/blob/9e590a68/src/test/etap/250-upgrade-legacy-view-files.t ---------------------------------------------------------------------- diff --git a/src/test/etap/250-upgrade-legacy-view-files.t b/src/test/etap/250-upgrade-legacy-view-files.t index 0d954b8..456de32 100644 --- a/src/test/etap/250-upgrade-legacy-view-files.t +++ b/src/test/etap/250-upgrade-legacy-view-files.t @@ -30,7 +30,6 @@ main(_) -> test() -> couch_server_sup:start_link(test_util:config_files()), - couch_index_sup:start_link(), % commit sofort ok = couch_config:set("query_server_config", "commit_freq", "0"),
