From b47b0eb1dcf380e6409bf5b16510d2e344397291 Mon Sep 17 00:00:00 2001
From: alesapin <alesapin@gmail.com>
Date: Tue, 8 Feb 2022 14:05:01 +0300
Subject: [PATCH] Revert accident change

---
 src/Storages/MergeTree/IMergeTreeDataPart.cpp                 | 2 +-
 .../0_stateless/01509_parallel_quorum_and_merge_long.sh       | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Storages/MergeTree/IMergeTreeDataPart.cpp b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
index d868e6b2a11..9028023dc80 100644
--- a/src/Storages/MergeTree/IMergeTreeDataPart.cpp
+++ b/src/Storages/MergeTree/IMergeTreeDataPart.cpp
@@ -1187,7 +1187,7 @@ std::optional<bool> IMergeTreeDataPart::keepSharedDataInDecoupledStorage() const
     if (force_keep_shared_data)
         return true;
 
-    return !storage.unlockSharedData(*this, is_temp ? relative_path : name);
+    return !storage.unlockSharedData(*this);
 }
 
 void IMergeTreeDataPart::remove() const
diff --git a/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh b/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
index f3cdb70a074..55b6110918b 100755
--- a/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
+++ b/tests/queries/0_stateless/01509_parallel_quorum_and_merge_long.sh
@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
-# Tags: long, no-replicated-database
+# Tags: long, no-replicated-database, no-s3-storage
 # Tag no-replicated-database: Fails due to additional replicas or shards
+# Tag no-s3-storage: Merge assigned to replica 2, but replication queues are stopped for it
+
 
 set -e