Skip to content

[DAQ] fix input source raw file deletion deadlock (15_1_X) #47641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smuzaffar merged 1 commit into from
Mar 20, 2025
Merged

[DAQ] fix input source raw file deletion deadlock (15_1_X) #47641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions EventFilter/Utilities/interface/FastMonitoringService.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ namespace evf {
void setTMicrostate(FastMonState::Microstate m);

static unsigned int getTID() { return tbb::this_task_arena::current_thread_index(); }
bool streamIsIdle(unsigned int i) const;

private:
void doSnapshot(const unsigned int ls, const bool isGlobalEOL);
Expand Down
2 changes: 1 addition & 1 deletion EventFilter/Utilities/src/DAQSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -649,7 +649,7 @@ void DAQSource::fileDeleter() {
for (unsigned int i = 0; i < streamFileTracker_.size(); i++) {
if (it->first == streamFileTracker_.at(i)) {
//only skip if LS is open
if (fileLSOpen) {
if (fileLSOpen && (!fms_ || !fms_->streamIsIdle(i))) {
fileIsBeingProcessed = true;
break;
}
Expand Down
5 changes: 5 additions & 0 deletions EventFilter/Utilities/src/FastMonitoringService.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1052,4 +1052,9 @@ namespace evf {
fmt_->jsonMonitor_->snap(ls);
}

bool FastMonitoringService::streamIsIdle(unsigned int i) const {
auto ms = microstate_.at(i);
return ms == getmIdle();
}

} //end namespace evf
2 changes: 1 addition & 1 deletion EventFilter/Utilities/src/FedRawDataInputSource.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -727,7 +727,7 @@ void FedRawDataInputSource::fileDeleter() {
for (unsigned int i = 0; i < streamFileTracker_.size(); i++) {
if (it->first == streamFileTracker_.at(i)) {
//only skip if LS is open
if (fileLSOpen) {
if (fileLSOpen && (!fms_ || !fms_->streamIsIdle(i))) {
fileIsBeingProcessed = true;
break;
}
Expand Down