Hashed Storage is enabled by default on new installations

updated documentation for Geo

5 files changed, 7 insertions, 14 deletions

diff --git a/spec/finders/fork_projects_finder_spec.rb b/spec/finders/fork_projects_finder_spec.rb
index b3fdffc3331..98cff37205e 100644
--- a/spec/finders/fork_projects_finder_spec.rb
+++ b/spec/finders/fork_projects_finder_spec.rb
@@ -12,6 +12,8 @@ describe ForkProjectsFinder do
   let(:private_fork_member) { create(:user) }
 
   before do
+    stub_feature_flags(object_pools: { enabled: false, thing: source_project })
+
     private_fork.update!(visibility_level: Gitlab::VisibilityLevel::PRIVATE)
     private_fork.add_developer(private_fork_member)
 
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index e6d5e8fc320..269d2bb90d3 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -3478,6 +3478,7 @@ describe Project do
 
     before do
       allow(project).to receive(:gitlab_shell).and_return(gitlab_shell)
+      stub_application_setting(hashed_storage_enabled: false)
     end
 
     describe '#base_dir' do
@@ -3584,10 +3585,6 @@ describe Project do
     let(:hashed_prefix) { File.join('@hashed', hash[0..1], hash[2..3]) }
     let(:hashed_path) { File.join(hashed_prefix, hash) }
 
-    before do
-      stub_application_setting(hashed_storage_enabled: true)
-    end
-
     describe '#legacy_storage?' do
       it 'returns false' do
         expect(project.legacy_storage?).to be_falsey
@@ -4729,10 +4726,6 @@ describe Project do
 
     subject { project.object_pool_params }
 
-    before do
-      stub_application_setting(hashed_storage_enabled: true)
-    end
-
     context 'when the objects cannot be pooled' do
       let(:project) { create(:project, :repository, :private) }
 
@@ -4778,10 +4771,6 @@ describe Project do
       context 'when objects are poolable' do
         let(:project) { create(:project, :repository, :public) }
 
-        before do
-          stub_application_setting(hashed_storage_enabled: true)
-        end
-
         it { is_expected.to be_git_objects_poolable }
       end
     end
diff --git a/spec/services/projects/after_rename_service_spec.rb b/spec/services/projects/after_rename_service_spec.rb
index b8055a285f2..8585d495ffb 100644
--- a/spec/services/projects/after_rename_service_spec.rb
+++ b/spec/services/projects/after_rename_service_spec.rb
@@ -23,6 +23,7 @@ describe Projects::AfterRenameService do
         allow(project).to receive(:gitlab_shell).and_return(gitlab_shell)
 
         stub_feature_flags(skip_hashed_storage_upgrade: false)
+        stub_application_setting(hashed_storage_enabled: false)
       end
 
       it 'renames a repository' do
diff --git a/spec/services/projects/create_service_spec.rb b/spec/services/projects/create_service_spec.rb
index a4c48991807..b0b74407812 100644
--- a/spec/services/projects/create_service_spec.rb
+++ b/spec/services/projects/create_service_spec.rb
@@ -228,6 +228,7 @@ describe Projects::CreateService, '#execute' do
 
       context 'with legacy storage' do
         before do
+          stub_application_setting(hashed_storage_enabled: false)
           gitlab_shell.create_repository(repository_storage, "#{user.namespace.full_path}/existing", 'group/project')
         end
 
@@ -259,7 +260,6 @@ describe Projects::CreateService, '#execute' do
         let(:hashed_path) { '@hashed/6b/86/6b86b273ff34fce19d6b804eff5a3f5747ada4eaa22f1d49c01e52ddb7875b4b' }
 
         before do
-          stub_application_setting(hashed_storage_enabled: true)
           allow(Digest::SHA2).to receive(:hexdigest) { hash }
         end
 
diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb
index 6afc91d5e95..0c109e26a6a 100644
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
@@ -116,11 +116,12 @@ describe Projects::ForkService do
         end
       end
 
-      context 'repository already exists' do
+      context 'repository in legacy storage already exists' do
         let(:repository_storage) { 'default' }
         let(:repository_storage_path) { Gitlab.config.repositories.storages[repository_storage].legacy_disk_path }
 
         before do
+          stub_application_setting(hashed_storage_enabled: false)
           gitlab_shell.create_repository(repository_storage, "#{@to_user.namespace.full_path}/#{@from_project.path}", "#{@to_user.namespace.full_path}/#{@from_project.path}")
         end