ctld: Add a dedicated conf method for shutting down
ClosedPublic
Actions

Authored by jhb on Mon, Apr 20, 4:57 PM.

Details

Reviewers

asomers
kevans

Commits

rGf1c5de5fab9d: ctld: Add a dedicated conf method for shutting down

Summary

Currently the main loop creates an empty config and applies it to
force a shutdown of all of the existing configuration. While this is
functional and does avoid duplicating some code, it is also a bit
clunky and requires a special hack in the pidfile path handling
in the conf::apply method.

Instead, use a dedicated conf::shutdown method which tears down the
CTL ports and LUNs and closes the sockets.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

jhb created this revision.Mon, Apr 20, 4:57 PM

Herald added a subscriber: imp. · View Herald TranscriptMon, Apr 20, 4:57 PM

jhb requested review of this revision.Mon, Apr 20, 4:57 PM

Harbormaster completed remote builds in B72376: Diff 175919.Mon, Apr 20, 4:57 PM

jhb added a parent revision: D56531: ctld: Mark a few more isns_* methods in the conf class private.Mon, Apr 20, 4:57 PM

jhb added a child revision: D56533: ctld: Simplify pidfile rename handling in conf::apply.

jhb added inline comments.Mon, Apr 20, 5:07 PM

usr.sbin/ctld/ctld.cc
2805	Even non-iSCSI "physical" ports are taken off line, so this log message could maybe just say "CTL ports"?

jhb added a reviewer: kevans.Fri, Apr 24, 2:15 PM

jhb added inline comments.

usr.sbin/ctld/ctld.cc
2218	Given that these are the second and third actions, maybe I should just remove the 'First' and 'Second' bits in these comments (which were copied from conf::apply above where they are also somewhat misnumbered)