diff options
| author | Vlad Alexandru Ionescu <vlad@rabbitmq.com> | 2011-02-20 16:44:56 -0600 |
|---|---|---|
| committer | Vlad Alexandru Ionescu <vlad@rabbitmq.com> | 2011-02-20 16:44:56 -0600 |
| commit | a92eef55da4181fa2d9443331f4eaf38c9aedbdb (patch) | |
| tree | 117824b5f221b9d7b32302ecd4a766767e43f9c1 /src | |
| parent | 8de8e2d9f8a7e49706e60f69a2458d9cc05abace (diff) | |
| download | rabbitmq-server-git-a92eef55da4181fa2d9443331f4eaf38c9aedbdb.tar.gz | |
moving wait_for_tables call in transform
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_upgrade_functions.erl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/rabbit_upgrade_functions.erl b/src/rabbit_upgrade_functions.erl index d6a79590dc..b9dbe418d9 100644 --- a/src/rabbit_upgrade_functions.erl +++ b/src/rabbit_upgrade_functions.erl @@ -49,7 +49,6 @@ %% point. remove_user_scope() -> - rabbit_mnesia:wait_for_tables([rabbit_user_permission]), transform( rabbit_user_permission, fun ({user_permission, UV, {permission, _Scope, Conf, Write, Read}}) -> @@ -58,7 +57,6 @@ remove_user_scope() -> [user_vhost, permission]). hash_passwords() -> - rabbit_mnesia:wait_for_tables([rabbit_user]), transform( rabbit_user, fun ({user, Username, Password, IsAdmin}) -> @@ -68,7 +66,6 @@ hash_passwords() -> [username, password_hash, is_admin]). add_ip_to_listener() -> - rabbit_mnesia:wait_for_tables([rabbit_listener]), transform( rabbit_listener, fun ({listener, Node, Protocol, Host, Port}) -> @@ -78,7 +75,6 @@ add_ip_to_listener() -> internal_exchanges() -> Tables = [rabbit_exchange, rabbit_durable_exchange], - rabbit_mnesia:wait_for_tables(Tables), AddInternalFun = fun ({exchange, Name, Type, Durable, AutoDelete, Args}) -> {exchange, Name, Type, Durable, AutoDelete, false, Args} @@ -90,7 +86,6 @@ internal_exchanges() -> ok. user_to_internal_user() -> - rabbit_mnesia:wait_for_tables([rabbit_user]), transform( rabbit_user, fun({user, Username, PasswordHash, IsAdmin}) -> @@ -109,10 +104,12 @@ topic_trie() -> %%-------------------------------------------------------------------- transform(TableName, Fun, FieldList) -> + rabbit_mnesia:wait_for_tables([TableName]), {atomic, ok} = mnesia:transform_table(TableName, Fun, FieldList), ok. transform(TableName, Fun, FieldList, NewRecordName) -> + rabbit_mnesia:wait_for_tables([TableName]), {atomic, ok} = mnesia:transform_table(TableName, Fun, FieldList, NewRecordName), ok. |