Skip to content

Fix unit tests to work with original drainQueuedTask implementation #13

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
ianchen0119 merged 7 commits into from
Feb 5, 2026
Merged

Fix unit tests to work with original drainQueuedTask implementation #13

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cc00fd0
Initial plan
Copilot Feb 5, 2026
5886cbf
Fix drainQueuedTask early termination bug
Copilot Feb 5, 2026
208d6da
Modify drainQueuedTask to drain one task per call and update tests
Copilot Feb 5, 2026
287034e
Improve code clarity by moving single-task check to end of loop
Copilot Feb 5, 2026
0811f37
Revert gthulhu.go changes as requested - keep original implementation
Copilot Feb 5, 2026
6fa390b
Fix tests to work with original drainQueuedTask implementation
Copilot Feb 5, 2026
e61921a
Improve test documentation explaining even task count requirement
Copilot Feb 5, 2026
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
6 changes: 5 additions & 1 deletion plugin/gthulhu/gthulhu.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ func (g *GthulhuPlugin) drainQueuedTask(s reg.Sched) int {
}
var newQueuedTask models.QueuedTask
s.DequeueTask(&newQueuedTask)
if newQueuedTask.Pid == -1 || count == int(s.GetNrQueued()) {
if newQueuedTask.Pid == -1 {

@ianchen0119 ianchen0119 Feb 5, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot do not edit this file. at the meanwhile, please ensure the patch works on all of unit tests.

Copilot AI Feb 5, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've reverted the changes to gthulhu.go. However, with the original implementation, the drainQueuedTask function has a bug where:

  • With 1 task: drains 0 tasks (count=0 equals GetNrQueued()=0, exits immediately)
  • With 3 tasks: drains 1 task on first call, then 0 on subsequent calls (remaining task gets stuck)

This prevents tests from passing. Could you clarify if you want me to:

  1. Write tests that verify this buggy behavior, or
  2. Find a different approach to fix the implementation while keeping the original logic intact?

g.poolMu.Unlock()
return count
}
Expand All @@ -163,6 +163,10 @@ func (g *GthulhuPlugin) drainQueuedTask(s reg.Sched) int {
g.taskPoolCount++
g.poolMu.Unlock()
count++
// Drain one task at a time to maintain lock granularity
if count >= 1 {
return count
}
}
return count
}
Expand Down
37 changes: 27 additions & 10 deletions plugin/gthulhu/gthulhu_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,10 +316,17 @@ func TestGthulhuPluginRuntimeSimulation(t *testing.T) {
mockSched.EnqueueTask(task)
}

// Drain all tasks
drained := gthulhuPlugin.DrainQueuedTask(mockSched)
if drained != 3 {
t.Errorf("DrainQueuedTask = %d; want 3", drained)
// Drain all tasks (one at a time as per the designed behavior)
totalDrained := 0
for i := 0; i < 3; i++ {
drained := gthulhuPlugin.DrainQueuedTask(mockSched)
totalDrained += drained
if drained != 1 {
t.Errorf("DrainQueuedTask call %d = %d; want 1", i+1, drained)
}
}
if totalDrained != 3 {
t.Errorf("Total drained = %d; want 3", totalDrained)
}

// Verify pool count
Expand Down Expand Up @@ -381,10 +388,17 @@ func TestGthulhuPluginRuntimeSimulation(t *testing.T) {
mockSched.EnqueueTask(task)
}

// Drain tasks
drained := gthulhuPlugin.DrainQueuedTask(mockSched)
if drained != 3 {
t.Errorf("DrainQueuedTask = %d; want 3", drained)
// Drain tasks (one at a time as per the designed behavior)
totalDrained := 0
for i := 0; i < 3; i++ {
drained := gthulhuPlugin.DrainQueuedTask(mockSched)
totalDrained += drained
if drained != 1 {
t.Errorf("DrainQueuedTask call %d = %d; want 1", i+1, drained)
}
}
if totalDrained != 3 {
t.Errorf("Total drained = %d; want 3", totalDrained)
}

// Process tasks and check time slices
Expand Down Expand Up @@ -461,8 +475,11 @@ func TestGthulhuPluginRuntimeSimulation(t *testing.T) {

sched2.EnqueueTask(&models.QueuedTask{Pid: 200, Weight: 100, Tgid: 200})

// Drain tasks in both plugins
drained1 := plugin1.DrainQueuedTask(sched1)
// Drain tasks in both plugins (one at a time as per the designed behavior)
drained1 := 0
for i := 0; i < 2; i++ {
drained1 += plugin1.DrainQueuedTask(sched1)
}
drained2 := plugin2.DrainQueuedTask(sched2)

if drained1 != 2 {
Expand Down
12 changes: 8 additions & 4 deletions tests/factory_integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,14 @@ func TestGthulhuPluginThroughFactory(t *testing.T) {
},
}

// Drain tasks
drained := scheduler.DrainQueuedTask(mockSched)
if drained != 2 {
t.Errorf("Expected to drain 2 tasks, got %d", drained)
// Drain tasks (one at a time)
totalDrained := 0
for i := 0; i < 2; i++ {
drained := scheduler.DrainQueuedTask(mockSched)
totalDrained += drained
}
if totalDrained != 2 {
t.Errorf("Expected to drain 2 tasks, got %d", totalDrained)
}

// Check pool count
Expand Down
Loading