Skip to content
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
13 changes: 0 additions & 13 deletions apps/grpo/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -490,23 +490,10 @@ async def continuous_training():
training_task.cancel()
finally:
print("Shutting down...")

# give mlogger time to shutdown backends, otherwise they can stay running.
# TODO (felipemello) find more elegant solution
await mlogger.shutdown.call_one()
Copy link
Contributor

Choose a reason for hiding this comment

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

@DNXie @felipemello1 maybe we can just move the mlogger shutdown into the global shutdown as well?

Copy link
Member Author

@DNXie DNXie Oct 13, 2025

Choose a reason for hiding this comment

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

I moved it into shutdown().

await asyncio.sleep(2)

await asyncio.gather(
DatasetActor.shutdown(dataloader),
policy.shutdown(),
RLTrainer.shutdown(trainer),
ReplayBuffer.shutdown(replay_buffer),
ComputeAdvantages.shutdown(compute_advantages),
ref_model.shutdown(),
reward_actor.shutdown(),
)
# TODO - add a global shutdown that implicitly shuts down all services
# and remote allocations
await shutdown()


Expand Down
2 changes: 1 addition & 1 deletion src/forge/actors/policy.py
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ async def launch( # pyright: ignore[reportIncompatibleMethodOverride]

@classmethod
async def shutdown( # pyright: ignore[reportIncompatibleMethodOverride]
cls: type["Policy"], actor: "Policy"
cls: type["Policy"], actor: "Policy", quiet: bool = False
):
assert (
actor._policy_proc is not None
Expand Down
22 changes: 19 additions & 3 deletions src/forge/controller/actor.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

from monarch.actor import Actor, current_rank, current_size, endpoint

from forge.controller.provisioner import get_proc_mesh, stop_proc_mesh
from forge.controller.provisioner import _get_provisioner, get_proc_mesh, stop_proc_mesh

from forge.types import ProcessConfig, ServiceConfig

Expand Down Expand Up @@ -127,7 +127,9 @@ async def as_service(
logger.info("Spawning Service for %s", cls.__name__)
service = Service(cfg, cls, actor_args, actor_kwargs)
await service.__initialize__()
return ServiceInterface(service, cls)
service_interface = ServiceInterface(service, cls)
await cls.register_allocation(service_interface)
return service_interface

@endpoint
async def setup(self):
Expand All @@ -144,6 +146,17 @@ async def setup(self):
"""
pass

@classmethod
async def register_allocation(cls, alloc: "ForgeActor | ServiceInterface") -> None:
"""Registers an allocation (service/actor) with the provisioner."""
provisioner = await _get_provisioner()
try:
provisioner = await _get_provisioner()
if provisioner is not None:
await provisioner.track_allocation(alloc)
except Exception as e:
logger.warning(f"Failed to register allocation {alloc}: {e}")

@classmethod
async def launch(cls, *args, **kwargs) -> "ForgeActor":
"""Provisions and deploys a new actor.
Expand Down Expand Up @@ -185,13 +198,16 @@ async def as_actor(cls: Type[T], *args, **actor_kwargs) -> T:
"""
logger.info("Spawning single actor %s", cls.__name__)
actor = await cls.launch(*args, **actor_kwargs)
await cls.register_allocation(actor)
return actor

@classmethod
async def shutdown(cls, actor: "ForgeActor"):
async def shutdown(cls, actor: "ForgeActor", quiet: bool = False):
"""Shuts down an actor.
This method is used by `Service` to teardown a replica.
"""
if not quiet:
logger.info(f"Shutting down actor {getattr(actor, 'name', cls.__name__)}")
Copy link
Member Author

Choose a reason for hiding this comment

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

Adding this quiet check because otherwise when we shutdown a service, it would call actor.shutdown and print the log twice.

if actor._proc_mesh is None:
raise AssertionError("Called shutdown on a replica with no proc_mesh.")
await stop_proc_mesh(actor._proc_mesh)
42 changes: 41 additions & 1 deletion src/forge/controller/provisioner.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import os
import socket
import uuid
from typing import Optional
from typing import Any, Optional

from monarch._src.actor.shape import NDSlice, Shape
from monarch.actor import Actor, endpoint, HostMesh, ProcMesh, this_host
Expand Down Expand Up @@ -132,6 +132,8 @@ def __init__(self, cfg: ProvisionerConfig | None = None):
if not self.launcher:
logger.warning("Launcher not provided, remote allocations will not work.")

self._allocations: list[Any] = [] # all live actor/service instances

async def initialize(self):
"""Call this after creating the instance"""
if self.launcher is not None:
Expand Down Expand Up @@ -303,8 +305,46 @@ async def stop_proc_mesh(self, proc_mesh: ProcMesh):
commands.kill(server_name)
del self._proc_host_map[proc_mesh]

async def track_allocation(self, alloc: Any):
"""Tracks an allocation for cleanup."""
from forge.controller.service import ServiceInterface

self._allocations.append(alloc)
Copy link
Contributor

Choose a reason for hiding this comment

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

hmmm, I think an even simpler approach is to just track the proc meshes right? We can just do await proc_mesh.stop() and I think everything inside of it should shut down neatly. Let me know if that doesn't work though

Copy link
Member Author

Choose a reason for hiding this comment

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

I think it would work for actor since shutting down actor is essentially stopping the proc_mesh.
But for service, it involves some other operations such as stopping the replicas and healthy loop.

alloc_type = "service" if isinstance(alloc, ServiceInterface) else "actor"
print(
f"Registered allocation {alloc_type} {alloc}, current allocations len: {len(self._allocations)}"
)

async def shutdown_all_allocations(self):
"""Gracefully shut down all tracked actors and services."""
from monarch._src.actor.actor_mesh import ActorMesh
Copy link
Contributor

Choose a reason for hiding this comment

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

can we do this at the toplevel? And use

from monarch.actor import ActorMesh

Copy link
Member Author

@DNXie DNXie Oct 13, 2025

Choose a reason for hiding this comment

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

I got

ImportError: cannot import name 'ActorMesh' from 'monarch.actor' (/home/dxie/.fbpkg_conda_envs/forge-e146614/lib/python3.10/site-packages/monarch/actor/__init__.py)

Sure I can do it on top-level.


from forge.controller.actor import ForgeActor
from forge.controller.service import ServiceInterface

for alloc in reversed(self._allocations):
try:
# --- ServiceInterface ---
if isinstance(alloc, ServiceInterface):
await alloc.shutdown()

# --- Actor instance (ForgeActor or underlying ActorMesh) ---
elif isinstance(alloc, (ForgeActor, ActorMesh)):
# Get the class to call shutdown on (ForgeActor or its bound class)
actor_cls = getattr(alloc, "_class", None) or alloc.__class__
await actor_cls.shutdown(alloc)

else:
logger.warning(f"Unknown allocation type: {type(alloc)}")

except Exception as e:
logger.warning(f"Failed to shut down {alloc}: {e}")

self._allocations.clear()

async def shutdown(self):
"""Tears down all remaining remote allocations."""
await self.shutdown_all_allocations()
async with self._lock:
for server_name in self._server_names:
commands.kill(server_name)
Expand Down
1 change: 1 addition & 0 deletions src/forge/controller/service/interface.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ async def shutdown(self) -> None:
"""
Shut down the underlying Service.
"""
logger.info(f"Shutting down service {self.actor_def.__name__}")
Copy link
Contributor

Choose a reason for hiding this comment

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

since we're quietly shutting down actors/replicas, in this log here can we mention how many actors we're shutting down?

Copy link
Member Author

Choose a reason for hiding this comment

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

Done. Now the log only says

Shutting down 3 service(s) and 4 actor(s)...

await self._service.stop()

def session(self) -> "SessionContext":
Expand Down
2 changes: 1 addition & 1 deletion src/forge/controller/service/replica.py
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,7 @@ async def stop(self):
# Stop the actor
if self.actor:
try:
await self.actor_def.shutdown(self.actor)
await self.actor_def.shutdown(self.actor, quiet=True)
except Exception as e:
logger.warning(
"Error stopping proc_mesh for replica %d: %s", self.idx, e
Expand Down
1 change: 0 additions & 1 deletion tests/sandbox/rl_trainer/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,6 @@ async def continuous_training():
print("Training interrupted by user")
finally:
print("Shutting down trainer...")
await RLTrainer.shutdown(trainer)
await mlogger.shutdown.call_one()
await shutdown()
print("Trainer shutdown complete.")
Expand Down
9 changes: 0 additions & 9 deletions tests/sandbox/toy_rl/sumdigits.py
Original file line number Diff line number Diff line change
Expand Up @@ -568,15 +568,6 @@ async def continuous_training():
training_task.cancel()
finally:
print("Shutting down...")
await asyncio.gather(
DatasetActor.shutdown(dataloader),
policy.shutdown(),
Trainer.shutdown(trainer),
ReplayBuffer.shutdown(replay_buffer),
reward_actor.shutdown(),
)
# TODO - add a global shutdown that implicitly shuts down all services
# and remote allocations
await shutdown()


Expand Down
6 changes: 0 additions & 6 deletions tests/sandbox/toy_rl/toy_metrics/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,6 @@ async def main():
# shutdown
await mlogger.shutdown.call_one()
await asyncio.sleep(2)

await asyncio.gather(
trainer.shutdown(),
generator.shutdown(),
)

await shutdown()


Expand Down
1 change: 0 additions & 1 deletion tests/sandbox/vllm/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ async def run(cfg: DictConfig):
print("-" * 80)

print("\nShutting down...")
await policy.shutdown()
await shutdown()


Expand Down