Skip to content

[openvswitch] Declare the OVS units in the services tuple - #4439

Open
suraj-cmd wants to merge 1 commit into
sosreport:mainfrom
suraj-cmd:openvswitch-services-tuple
Open

[openvswitch] Declare the OVS units in the services tuple#4439
suraj-cmd wants to merge 1 commit into
sosreport:mainfrom
suraj-cmd:openvswitch-services-tuple

Conversation

@suraj-cmd

Copy link
Copy Markdown
Contributor

setup() calls add_journal() for six units — openvswitch,
openvswitch-nonetwork, ovs-vswitchd, ovsdb-server, ovs-configuration
and openvswitch-ipsec — but the plugin declares no services tuple and
collects no service status for any of them.

An sosreport from a host where ovs-vswitchd or ovsdb-server has failed to
start therefore has the journal but nothing showing the unit state, which is
usually the first thing checked when OVS is down.

Plugin._collect_services() runs each entry of the tuple through
is_service() and calls both add_service_status() and add_journal(), so
declaring the units adds the six missing statuses and replaces the explicit
calls.

The tuple is declared on the shared base class so it applies to both
distribution subclasses.

The virtual-accelerator journal in collect_ovs_info() is deliberately left
as an explicit call: it is guarded by an is_installed() check for
6windgate-fp and so is conditional rather than a property of the plugin.

Follows @TurboTurtle's review comment on #4429, and the same change made in
#4436, #4437 and #4438. The before/after behaviour is demonstrated on #4437,
where systemctl_status_chronyd appears only with the change applied.


Please place an 'X' inside each '[]' to confirm you adhere to our Contributor Guidelines

  • Is the commit message split over multiple lines and hard-wrapped at 72 characters?
  • Is the subject and message clear and concise?
  • Does the subject start with [plugin_name] if submitting a plugin patch or a [section_name] if part of the core sosreport code?
  • Does the commit contain a Signed-off-by: First Lastname email@example.com?
  • Are any related Issues or existing PRs properly referenced via a Closes (Issue) or Resolved (PR) line?
  • Are all passwords or private data gathered by this PR obfuscated?

setup() calls add_journal() for six units - openvswitch,
openvswitch-nonetwork, ovs-vswitchd, ovsdb-server,
ovs-configuration and openvswitch-ipsec - but the plugin
declares no services tuple and collects no service status for
any of them.

An sosreport from a host where ovs-vswitchd or ovsdb-server has
failed to start therefore has the journal but nothing showing
the unit state, which is usually the first thing checked when
OVS is down.

Plugin._collect_services() runs each entry of the tuple through
is_service() and calls both add_service_status() and
add_journal(), so declaring the units adds the six missing
statuses and replaces the explicit calls.

The tuple is declared on the shared base class so it applies to
both distribution subclasses.

The virtual-accelerator journal in collect_ovs_info() is left
as an explicit call: it is guarded by an is_installed() check
for 6windgate-fp and so is conditional rather than a property
of the plugin.

Signed-off-by: Suraj Patil <surajpatil522@gmail.com>
@packit-as-a-service

Copy link
Copy Markdown

Congratulations! One of the builds has completed. 🍾

You can install the built RPMs by following these steps:

  • sudo dnf install -y 'dnf*-command(copr)'
  • dnf copr enable packit/sosreport-sos-4439
  • And now you can install the packages.

Please note that the RPMs should be used only in a testing environment.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant