fix WRR race condition

markdroth · Aug 17, 2023 · 8a746ad · 8a746ad
1 parent 33082ba
commit 8a746ad
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc b/src/core/ext/filters/client_channel/lb_policy/weighted_round_robin/weighted_round_robin.cc
@@ -603,7 +603,9 @@ void WeightedRoundRobin::Picker::BuildSchedulerAndStartTimerLocked() {
   // Start timer.
   WeakRefCountedPtr<Picker> self = WeakRef();
   timer_handle_ = wrr_->channel_control_helper()->GetEventEngine()->RunAfter(
-      config_->weight_update_period(), [self = std::move(self)]() mutable {
+      config_->weight_update_period(),
+      [self = std::move(self), work_serializer = wrr_->work_serializer()]()
+          mutable {
         ApplicationCallbackExecCtx callback_exec_ctx;
         ExecCtx exec_ctx;
         {
@@ -617,9 +619,7 @@ void WeightedRoundRobin::Picker::BuildSchedulerAndStartTimerLocked() {
           }
         }
         // Release the picker ref inside the WorkSerializer.
-        auto* self_ptr = self.get();
-        self_ptr->wrr_->work_serializer()->Run([self = std::move(self)]() {},
-                                               DEBUG_LOCATION);
+        work_serializer->Run([self = std::move(self)]() {}, DEBUG_LOCATION);
       });
 }