X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;fp=src%2Fbin%2Flttng-sessiond%2Frotation-thread.c;h=05627f9345d6151e28db2a3534a99c9f1b5d08b9;hp=2b44036a2276c224b108fd26760d3063770660c9;hb=6ae1bf4602f7bfd3a1a206aaf98295191cef5082;hpb=5a72475c0a40375466410814049c218cb1755ab3 diff --git a/src/bin/lttng-sessiond/rotation-thread.c b/src/bin/lttng-sessiond/rotation-thread.c index 2b44036a2..05627f934 100644 --- a/src/bin/lttng-sessiond/rotation-thread.c +++ b/src/bin/lttng-sessiond/rotation-thread.c @@ -489,14 +489,14 @@ int check_session_rotation_pending(struct ltt_session *session, */ ret = timer_session_rotation_pending_check_stop(session); if (ret) { - goto end; + goto check_ongoing_rotation; } check_session_rotation_pending_on_consumers(session, &rotation_completed); if (!rotation_completed || session->rotation_state == LTTNG_ROTATION_STATE_ERROR) { - goto end; + goto check_ongoing_rotation; } /* @@ -562,7 +562,7 @@ int check_session_rotation_pending(struct ltt_session *session, } ret = 0; -end: +check_ongoing_rotation: if (session->rotation_state == LTTNG_ROTATION_STATE_ONGOING) { uint64_t chunk_being_archived_id; @@ -582,6 +582,7 @@ end: } } +end: return ret; }