Fix --tail log on restart problem

[rhatdan]

--tail=1 is not working f you restart a container with journald logging.

We see the exit status and then call into the logging a second time
causing all of the logs to print.

Removing the tail log on exited seems to fix the problem.

Fixes: #13098

Signed-off-by: Daniel J Walsh [email protected]

[nalind]

If it passes tests and doesn't bring back #12263, it's fine.

[edsantiago]

Mostly LGTM, with a few nits, and one big question: should the new test conform to the existing convention of testing under both k8s-file and journald?

Actually, two questions: regardless of the answer to the above, I think skip_if_journald_unavailable might be needed to avoid the usual mad panic when this makes it into RHEL-land.

[edsantiago]

unused

[edsantiago]

Could you rename this message? Maybe "logs, after restart, should still only show last line"? Distinct error messages make it sooooo much easier to track down the exact failure.

[edsantiago]

New push addresses two of my nits. Can you, for posterity, at least comment on my other questions? I don't know where we stand these days on rootless RHEL journald.

[rhatdan]

I think we should test with both, if possible.

[edsantiago]

I'm interpreting that as a request for code:

function _log_test_tail() {
    local driver=$1

    run_podman run -d --log-driver=$driver $IMAGE sh -c "echo test1; echo test2"
    cid="$output"

    run_podman logs --tail 1 $cid
    is "$output" "test2"  "logs should only show last line"

    run_podman restart $cid

    run_podman logs --tail 1 $cid
    is "$output" "test2"  "logs should only show last line after restart"

    run_podman rm $cid
}

@test "podman logs - tail test, k8s-file" {
    _log_test_tail k8s-file
}

@test "podman logs - tail test, journald" {
    # We can't use journald on RHEL as rootless: rhbz#1895105
    skip_if_journald_unavailable

    _log_test_tail journald
}

[rhatdan]

@edsantiago Added your code.

[edsantiago]

LGTM assuming tests pass. FYI I ran new tests against main, and the k8s-file one passes root & rootless, journald fails root & rootless, which means both test and code are doing the right thing.

/lgtm
/hold

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: edsantiago, rhatdan

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [edsantiago,rhatdan]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[rhatdan]

/hold cancel