wip

Author: hairyhum

src/rabbit_binding.erl

@@ -149,10 +149,10 @@ add(Binding, ActingUser) -> add(Binding, fun (_Src, _Dst) -> ok end, ActingUser)
 -spec add(rabbit_types:binding(), inner_fun(), rabbit_types:username()) -> bind_res().
 
 add(Binding, InnerFun, ActingUser) ->
-    Res = binding_action(
+    binding_action(
       Binding,
       fun (Src, Dst, B) ->
-              Res1 = case rabbit_exchange:validate_binding(Src, B) of
+              case rabbit_exchange:validate_binding(Src, B) of
                   ok ->
                       lock_resource(Src, read),
                       lock_resource(Dst, read),
@@ -170,12 +170,8 @@ add(Binding, InnerFun, ActingUser) ->
                       end;
                   {error, _} = Err ->
                       rabbit_misc:const(Err)
-              end,
-              io:format("Inner action result ~p~n", [Res1]),
-              Res1
-      end, fun not_found_or_absent_errs/1),
-    io:format("Binding action result ~p~n", [Res]),
-    Res.
+              end
+      end, fun not_found_or_absent_errs/1).
 
 add(Src, Dst, B, ActingUser) ->
     [SrcDurable, DstDurable] = [durable(E) || E <- [Src, Dst]],

src/rabbit_table.erl

@@ -70,7 +70,7 @@ ensure_secondary_index(Table, Field) ->
 
 create_local_copy(disc) ->
     create_local_copy(schema, ram_copies),
-    create_local_copies(disc);
+    create_local_copies(ram);
 create_local_copy(ram)  ->
     create_local_copies(ram),
     create_local_copy(schema, ram_copies).
@@ -304,6 +304,7 @@ definitions() ->
      {rabbit_listener,
       [{record_name, listener},
        {attributes, record_info(fields, listener)},
+       {ram_copies, [node()]},
        {type, bag},
        {match, #listener{_='_'}}]},
      {rabbit_durable_route,
@@ -314,32 +315,38 @@ definitions() ->
      {rabbit_semi_durable_route,
       [{record_name, route},
        {attributes, record_info(fields, route)},
+       {ram_copies, [node()]},
        {type, ordered_set},
        {match, #route{binding = binding_match(), _='_'}}]},
      {rabbit_route,
       [{record_name, route},
        {attributes, record_info(fields, route)},
+       {ram_copies, [node()]},
        {type, ordered_set},
        {match, #route{binding = binding_match(), _='_'}}]},
      {rabbit_reverse_route,
       [{record_name, reverse_route},
        {attributes, record_info(fields, reverse_route)},
+       {ram_copies, [node()]},
        {type, ordered_set},
        {match, #reverse_route{reverse_binding = reverse_binding_match(),
                               _='_'}}]},
      {rabbit_topic_trie_node,
       [{record_name, topic_trie_node},
        {attributes, record_info(fields, topic_trie_node)},
+       {ram_copies, [node()]},
        {type, ordered_set},
        {match, #topic_trie_node{trie_node = trie_node_match(), _='_'}}]},
      {rabbit_topic_trie_edge,
       [{record_name, topic_trie_edge},
        {attributes, record_info(fields, topic_trie_edge)},
+       {ram_copies, [node()]},
        {type, ordered_set},
        {match, #topic_trie_edge{trie_edge = trie_edge_match(), _='_'}}]},
      {rabbit_topic_trie_binding,
       [{record_name, topic_trie_binding},
        {attributes, record_info(fields, topic_trie_binding)},
+       {ram_copies, [node()]},
        {type, ordered_set},
        {match, #topic_trie_binding{trie_binding = trie_binding_match(),
                                    _='_'}}]},
@@ -351,10 +358,12 @@ definitions() ->
      {rabbit_exchange,
       [{record_name, exchange},
        {attributes, record_info(fields, exchange)},
+       {ram_copies, [node()]},
        {match, #exchange{name = exchange_name_match(), _='_'}}]},
      {rabbit_exchange_serial,
       [{record_name, exchange_serial},
        {attributes, record_info(fields, exchange_serial)},
+       {ram_copies, [node()]},
        {match, #exchange_serial{name = exchange_name_match(), _='_'}}]},
      {rabbit_runtime_parameters,
       [{record_name, runtime_parameters},
@@ -369,6 +378,7 @@ definitions() ->
      {rabbit_queue,
       [{record_name, amqqueue},
        {attributes, amqqueue:fields()},
+       {ram_copies, [node()]},
        {match, amqqueue:pattern_match_on_name(queue_name_match())}]}]
         ++ gm:table_definitions()
         ++ mirrored_supervisor:table_definitions().