You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2012/11/13 14:33:55 UTC
[1/2] git commit: Log problems opening database at ERROR level except
for auto-created system dbs
Updated Branches:
refs/heads/1.3.x 5dbd53bab -> bbb6b95d6
refs/heads/master 2057b8956 -> 41667642f
Log problems opening database at ERROR level except for auto-created system dbs
Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/bbb6b95d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/bbb6b95d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/bbb6b95d
Branch: refs/heads/1.3.x
Commit: bbb6b95d64278dc64beb165c53e7f81bc0c9a79e
Parents: 5dbd53b
Author: Robert Newson <rn...@apache.org>
Authored: Fri Mar 23 14:06:22 2012 +0000
Committer: Robert Newson <rn...@apache.org>
Committed: Tue Nov 13 13:32:42 2012 +0000
----------------------------------------------------------------------
.../src/couch_replicator_manager.erl | 2 +-
src/couchdb/couch_auth_cache.erl | 2 +-
src/couchdb/couch_db.erl | 2 +-
src/couchdb/couch_file.erl | 8 ++++++--
4 files changed, 9 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bbb6b95d/src/couch_replicator/src/couch_replicator_manager.erl
----------------------------------------------------------------------
diff --git a/src/couch_replicator/src/couch_replicator_manager.erl b/src/couch_replicator/src/couch_replicator_manager.erl
index 15d6255..fec44df 100644
--- a/src/couch_replicator/src/couch_replicator_manager.erl
+++ b/src/couch_replicator/src/couch_replicator_manager.erl
@@ -579,7 +579,7 @@ zone(Hr, Min) ->
ensure_rep_db_exists() ->
DbName = ?l2b(couch_config:get("replicator", "db", "_replicator")),
UserCtx = #user_ctx{roles = [<<"_admin">>, <<"_replicator">>]},
- case couch_db:open_int(DbName, [sys_db, {user_ctx, UserCtx}]) of
+ case couch_db:open_int(DbName, [sys_db, {user_ctx, UserCtx}, nologifmissing]) of
{ok, Db} ->
Db;
_Error ->
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bbb6b95d/src/couchdb/couch_auth_cache.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_auth_cache.erl b/src/couchdb/couch_auth_cache.erl
index f90a5be..42ccd44 100644
--- a/src/couchdb/couch_auth_cache.erl
+++ b/src/couchdb/couch_auth_cache.erl
@@ -386,7 +386,7 @@ get_user_props_from_db(UserName) ->
).
ensure_users_db_exists(DbName, Options) ->
- Options1 = [{user_ctx, #user_ctx{roles=[<<"_admin">>]}} | Options],
+ Options1 = [{user_ctx, #user_ctx{roles=[<<"_admin">>]}}, nologifmissing | Options],
case couch_db:open(DbName, Options1) of
{ok, Db} ->
ensure_auth_ddoc_exists(Db, <<"_design/_auth">>),
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bbb6b95d/src/couchdb/couch_db.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_db.erl b/src/couchdb/couch_db.erl
index 81e97f2..96f6719 100644
--- a/src/couchdb/couch_db.erl
+++ b/src/couchdb/couch_db.erl
@@ -51,7 +51,7 @@ open_db_file(Filepath, Options) ->
{error, enoent} ->
% couldn't find file. is there a compact version? This can happen if
% crashed during the file switch.
- case couch_file:open(Filepath ++ ".compact") of
+ case couch_file:open(Filepath ++ ".compact", [nologifmissing]) of
{ok, Fd} ->
?LOG_INFO("Found ~s~s compaction file, using as primary storage.", [Filepath, ".compact"]),
ok = file:rename(Filepath ++ ".compact", Filepath),
http://git-wip-us.apache.org/repos/asf/couchdb/blob/bbb6b95d/src/couchdb/couch_file.erl
----------------------------------------------------------------------
diff --git a/src/couchdb/couch_file.erl b/src/couchdb/couch_file.erl
index e00b0f0..54ff693 100644
--- a/src/couchdb/couch_file.erl
+++ b/src/couchdb/couch_file.erl
@@ -58,8 +58,12 @@ open(Filepath, Options) ->
{trap_exit, true} -> receive {'EXIT', Pid, _} -> ok end;
{trap_exit, false} -> ok
end,
- ?LOG_DEBUG("Could not open file ~s: ~s",
- [Filepath, file:format_error(Reason)]),
+ case {lists:member(nologifmissing, Options), Reason} of
+ {true, enoent} -> ok;
+ _ ->
+ ?LOG_ERROR("Could not open file ~s: ~s",
+ [Filepath, file:format_error(Reason)])
+ end,
Error
end;
Error ->