Merge remote-tracking branch 'couchbase/trinity' into phoenix

This merge was non-trivial, and required a few minor fixes to ensure
that tests pass:
- Re-addition of config_profile:unload_profile_for_test() in
  failover_test_teardown/2, as it needed moving from
  manual_failover_test_teardown/2, but didn't exist in trinity
- Fixing new include of cut.hrl to use new path in phoenix
- Removal of no longer needed X_teardown functions, replacing with
  failover_test_teardown, which was performed in original change to
  master, but couldn't be included in the backport as the tests didn't
  exist in trinity
- Addition of mock for ns_node_disco_events in
  graceful_failover_test_setup, needed now that fake_ns_pubsub isn't
  being used. Note, this change was made originally in master when
  fake_ns_pubsub was removed, but the graceful_failover tests don't
  exist in trinity, so that part of the change couldn't be backported
  to trinity. As such, the change made here is as close to the master
  version, to ease future merge-forwards.
- Moving mock for cb_atomic_persistent_term from failover_tests to
  mock_helpers, as this change was originally made when adding
  mock_helpers, but lost in the backport to trinity as this function
  doesn't exist in trinity
- Rename fake_chronicle_kv:new -> setup and unload -> teardown for
  usages not in trinity

* couchbase/trinity:
  MB-67857: Notify on fake_chronicle_kv key updates
  MB-67857: Simplify fake_chronicle_kv:update_snapshot/2
  MB-67857: Use ?FUNCTION_NAME in mock_helpers
  MB-67857: Fix ns_rebalance_report_manager name in mock_helpers
  MB-67857[BP]: Support concurrent writers in fake_chronicle_kv
  MB-67857[BP]: Put fake_chronicle_kv seqno in snapshot
  MB-67857[BP]: Remove ns_pubsub mock
  MB-67857[BP]: Rename fake_chronicle_kv:new/unload to setup/teardown
  MB-67857[BP]: Refactor to avoid fake_ns_pubsub uses
  MB-67857[BP]: Pull failover test mocks into new module
  MB-67857[BP]: Simplify meck unloading
  MB-67857[BP]: Fix fake_chronicle_kv
  MB-66812: Add metakv API test

Change-Id: I12c632d6bd07485970928e673a1d91d56ca8ec08

Author: Peter-Searby

apps/ns_server/src/chronicle_metakv.erl

@@ -416,10 +416,10 @@ sync_quorum(Timeout) ->
 -ifdef(TEST).
 
 setup() ->
-    fake_chronicle_kv:new().
+    fake_chronicle_kv:setup().
 
 teardown(_) ->
-    fake_chronicle_kv:unload().
+    fake_chronicle_kv:teardown().
 
 get_dir_content(Dir) ->
     get_dir_content(Dir, true).

apps/ns_server/src/jwt_issuer.erl

@@ -98,7 +98,7 @@ basic_test() ->
 
     meck:new(chronicle_compat_events, [passthrough]),
     meck:expect(chronicle_compat_events, subscribe, fun(_) -> ok end),
-    fake_chronicle_kv:new(),
+    fake_chronicle_kv:setup(),
     fake_chronicle_kv:update_snapshot(?JWT_SIGNING_KEYS_KEY, generate_keys()),
     fake_chronicle_kv:update_snapshot(ns_bucket:root(), []),
 
@@ -120,7 +120,7 @@ basic_test() ->
                                  password_expired = false}, _}, RV1),
 
     gen_server:stop(CachePid),
-    fake_chronicle_kv:unload(),
+    fake_chronicle_kv:teardown(),
     fake_ns_config:teardown(),
     meck:unload(chronicle_compat_events).
 

apps/ns_server/src/menelaus_web_crud.erl

@@ -510,10 +510,10 @@ setup() ->
                 fun (_, Body, _) ->
                         ejson:encode(Body)
                 end),
-    fake_chronicle_kv:new().
+    fake_chronicle_kv:setup().
 
 teardown(_) ->
-    fake_chronicle_kv:unload(),
+    fake_chronicle_kv:teardown(),
     meck:unload(menelaus_util),
     meck:unload(cb_util),
     meck:unload(rpc).

apps/ns_server/src/ns_bucket.erl

@@ -3653,7 +3653,7 @@ get_max_buckets_test_() ->
              <- Tests]}.
 
 uuid2bucket_key_test() ->
-    fake_chronicle_kv:new(),
+    fake_chronicle_kv:setup(),
     meck:new(cluster_compat_mode, [passthrough]),
     try
         Root = root(),
@@ -3797,7 +3797,7 @@ uuid2bucket_key_test() ->
                                                      Snapshot2))
     after
         meck:unload(cluster_compat_mode),
-        fake_chronicle_kv:unload()
+        fake_chronicle_kv:teardown()
     end.
 
 -endif.

apps/ns_server/test/dcp_tests.erl

@@ -32,7 +32,7 @@ dcp_test_setup(#{nodes := Nodes,
                  buckets := Buckets,
                  connections := Conns} = _SetupCfg) ->
     fake_ns_config:setup(),
-    fake_chronicle_kv:new(),
+    fake_chronicle_kv:setup(),
 
     set_conn_count_for_buckets(Buckets, Conns),
 
@@ -90,7 +90,7 @@ dcp_test_teardown(_SetupCfg, PidMap) ->
 
     meck:unload(ns_memcached),
 
-    fake_chronicle_kv:unload(),
+    fake_chronicle_kv:teardown(),
     fake_ns_config:teardown().
 
 set_replication_for_buckets(Buckets, Replications) ->