Skip to content

Commit

Permalink
Merge pull request #372 from haozturk/patch-reaper-893
Browse files Browse the repository at this point in the history
Patch reaper to fix cmsrucio 893
  • Loading branch information
ericvaandering authored Feb 19, 2025
2 parents 50dd049 + b5eae9f commit 2ef3f0e
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 0 deletions.
22 changes: 22 additions & 0 deletions apps/base/patches/haozturk-4.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
From a5b444bb92f2b1b9e49037611b6b96a9e053d3d7 Mon Sep 17 00:00:00 2001
From: Hasan Ozturk <[email protected]>
Date: Wed, 19 Feb 2025 13:24:25 +0100
Subject: [PATCH] remove rucio commit a37861b due to CMSRucio issue 893

---
lib/rucio/daemons/reaper/reaper.py | 2 --
1 file changed, 2 deletions(-)

diff --git a/lib/rucio/daemons/reaper/reaper.py b/lib/rucio/daemons/reaper/reaper.py
index ad6dc24924..3c7131aa7e 100644
--- a/lib/rucio/daemons/reaper/reaper.py
+++ b/lib/rucio/daemons/reaper/reaper.py
@@ -16,8 +16,6 @@
Reaper is a daemon to manage file deletion.
'''

-import concurrent.futures.thread # noqa (https://github.com/rucio/rucio/issues/6548)
-
import functools
import logging
import random
5 changes: 5 additions & 0 deletions apps/base/patches/kustomization.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,8 @@ secretGenerator:
disableNameSuffixHash: true
files:
- rahul-4.patch
- name: haozturk-4-patch
options:
disableNameSuffixHash: true
files:
- haozturk-4.patch
3 changes: 3 additions & 0 deletions apps/base/rucio-daemons/cms-rucio-daemons.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ secretMounts:
- secretFullName: 7170-deep-patch
mountPath: /patch/7170-deep.patch
subPath: 7170-deep.patch
- secretFullName: haozturk-4-patch
mountPath: /patch/haozturk-4.patch
subPath: haozturk-4.patch

abacusAccountCount: 1
abacusRseCount: 1
Expand Down

0 comments on commit 2ef3f0e

Please sign in to comment.