Enable permission aware ref database per default
Change-Id: I74659871d2095d438d573a96070d1e9a692ba0c9
diff --git a/Documentation/config-gerrit.txt b/Documentation/config-gerrit.txt
index c0605a0..39ad1ca 100644
--- a/Documentation/config-gerrit.txt
+++ b/Documentation/config-gerrit.txt
@@ -3865,13 +3865,11 @@
`ADVERTISE_REF_HOOK` relies on the fact that advertise refs filter is called
by the JGit layer, `PERMISSION_AWARE_REF_DATABASE` backend replaces ref
database with a permission-aware implementation. This database will only
-ever return refs that the user has access to. For backwards compatibility
-`ADVERTISE_REF_HOOK` is the default backend.
+ever return refs that the user has access to.
+
-In future gerrit releases, the default will be switched, the old backend
-will be deprecated and removed.
+In future gerrit releases, the old backend will be deprecated and removed.
+
-By default, `ADVERTISE_REF_HOOK`.
+By default, `PERMISSION_AWARE_REF_DATABASE`.
[[receive.enableProtocolV2]]receive.enableProtocolV2::
+
diff --git a/java/com/google/gerrit/server/git/TransferConfig.java b/java/com/google/gerrit/server/git/TransferConfig.java
index 6091195..f1dcc72 100644
--- a/java/com/google/gerrit/server/git/TransferConfig.java
+++ b/java/com/google/gerrit/server/git/TransferConfig.java
@@ -49,7 +49,10 @@
cfg.getBoolean("receive", "inheritProjectMaxObjectSizeLimit", false);
refPermissionBackend =
cfg.getEnum(
- "receive", null, "refPermissionBackend", RefPermissionBackend.ADVERTISE_REF_HOOK);
+ "receive",
+ null,
+ "refPermissionBackend",
+ RefPermissionBackend.PERMISSION_AWARE_REF_DATABASE);
enableProtocolV2 = cfg.getBoolean("receive", "enableProtocolV2", false);
packConfig = new PackConfig();
diff --git a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
index 65cdc55..76ef95b 100644
--- a/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
+++ b/javatests/com/google/gerrit/acceptance/git/RefAdvertisementIT.java
@@ -122,13 +122,10 @@
}
@ConfigSuite.Config
- public static Config enableRefPermissionBackend() {
+ public static Config enableAdvertiseRefsHook() {
Config cfg = new Config();
cfg.setString(
- "receive",
- null,
- "refPermissionBackend",
- RefPermissionBackend.PERMISSION_AWARE_REF_DATABASE.name());
+ "receive", null, "refPermissionBackend", RefPermissionBackend.ADVERTISE_REF_HOOK.name());
return cfg;
}