Skip to content
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

Jump to bottom

pacific: osd: fix shard-threads cannot wakeup bug #51262

Merged
merged 1 commit into from Nov 28, 2023
Merged

pacific: osd: fix shard-threads cannot wakeup bug #51262

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions src/osd/OSD.cc
View file
Open in desktop
Expand Up @@ -10624,7 +10624,7 @@ void OSDShard::consume_map(
dout(10) << new_osdmap->get_epoch()
<< " (was " << (old_osdmap ? old_osdmap->get_epoch() : 0) << ")"
<< dendl;
bool queued = false;
int queued = 0;

// check slots
auto p = pg_slots.begin();
Expand All @@ -10651,8 +10651,7 @@ void OSDShard::consume_map(
dout(20) << __func__ << " " << pgid
<< " pending_peering first epoch " << first
<< " <= " << new_osdmap->get_epoch() << ", requeueing" << dendl;
_wake_pg_slot(pgid, slot);
queued = true;
queued += _wake_pg_slot(pgid, slot);
}
++p;
continue;
Expand Down Expand Up @@ -10692,14 +10691,18 @@ void OSDShard::consume_map(
}
if (queued) {
std::lock_guard l{sdata_wait_lock};
sdata_cond.notify_one();
if (queued == 1)
sdata_cond.notify_one();
else
sdata_cond.notify_all();
}
}

void OSDShard::_wake_pg_slot(
int OSDShard::_wake_pg_slot(
spg_t pgid,
OSDShardPGSlot *slot)
{
int count = 0;
dout(20) << __func__ << " " << pgid
<< " to_process " << slot->to_process
<< " waiting " << slot->waiting
Expand All @@ -10708,12 +10711,14 @@ void OSDShard::_wake_pg_slot(
i != slot->to_process.rend();
++i) {
scheduler->enqueue_front(std::move(*i));
count++;
}
slot->to_process.clear();
for (auto i = slot->waiting.rbegin();
i != slot->waiting.rend();
++i) {
scheduler->enqueue_front(std::move(*i));
count++;
}
slot->waiting.clear();
for (auto i = slot->waiting_peering.rbegin();
Expand All @@ -10724,10 +10729,12 @@ void OSDShard::_wake_pg_slot(
// someday, if we decide this inefficiency matters
for (auto j = i->second.rbegin(); j != i->second.rend(); ++j) {
scheduler->enqueue_front(std::move(*j));
count++;
}
}
slot->waiting_peering.clear();
++slot->requeue_seq;
return count;
}

void OSDShard::identify_splits_and_merges(
Expand Down
2 changes: 1 addition & 1 deletion src/osd/OSD.h
View file
Open in desktop
Expand Up @@ -1094,7 +1094,7 @@ struct OSDShard {
const OSDMapRef& osdmap,
unsigned *pushes_to_free);

void _wake_pg_slot(spg_t pgid, OSDShardPGSlot *slot);
int _wake_pg_slot(spg_t pgid, OSDShardPGSlot *slot);

void identify_splits_and_merges(
const OSDMapRef& as_of_osdmap,
Expand Down