diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2018-09-27 06:20:33 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2018-09-27 06:20:33 +0300 |
| commit | cab7e5805bd692d4e4bcf422075a21ecef2b7209 (patch) | |
| tree | 034790ac26bcb9d194083e7dea07b870d6756ae1 /src | |
| parent | ee1f21168baa52e6bbd74201be54131640361e5e (diff) | |
| download | rabbitmq-server-git-cab7e5805bd692d4e4bcf422075a21ecef2b7209.tar.gz | |
Make rabbit_vhost:add/2 idempotent
Part of rabbitmq/rabbitmq-cli#260
[#160792770]
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_vhost.erl | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/rabbit_vhost.erl b/src/rabbit_vhost.erl index fdcba35db2..bf89805d13 100644 --- a/src/rabbit_vhost.erl +++ b/src/rabbit_vhost.erl @@ -83,7 +83,13 @@ recover(VHost) -> -define(INFO_KEYS, [name, tracing, cluster_state]). -add(VHostPath, ActingUser) -> +add(VHost, ActingUser) -> + case exists(VHost) of + true -> ok; + false -> do_add(VHost, ActingUser) + end. + +do_add(VHostPath, ActingUser) -> rabbit_log:info("Adding vhost '~s'~n", [VHostPath]), R = rabbit_misc:execute_mnesia_transaction( fun () -> @@ -91,7 +97,8 @@ add(VHostPath, ActingUser) -> [] -> ok = mnesia:write(rabbit_vhost, #vhost{virtual_host = VHostPath}, write); - [_] -> mnesia:abort({vhost_already_exists, VHostPath}) + %% the vhost already exists + [_] -> ok end end, fun (ok, true) -> |