Fix: src.ctf.lttng-live: session closed before any metadata is received

[babeltrace.git] / src / plugins / ctf / lttng-live / metadata.c

diff --git a/src/plugins/ctf/lttng-live/metadata.c b/src/plugins/ctf/lttng-live/metadata.c
index d347534da7e006457c845df89e33bac3ad4b24cd..e4e6214ad1a8346018a562318ae99026a7b6e712 100644 (file)
--- a/src/plugins/ctf/lttng-live/metadata.c
+++ b/src/plugins/ctf/lttng-live/metadata.c
@@ -136,7 +136,14 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
 
        /* No metadata stream yet. */
        if (!metadata) {
-               if (session->new_streams_needed) {
+               if (session->closed) {
+                       /*
+                        * The session is closed AND we never received any
+                        * metadata this indicates that we will never receive
+                        * any metadata.
+                        */
+                       status = LTTNG_LIVE_ITERATOR_STATUS_END;
+               } else if (session->new_streams_needed) {
                        status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
                } else {
                        session->new_streams_needed = true;
@@ -145,11 +152,7 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
                goto end;
        }
 
-       if (!metadata->trace) {
-               trace->new_metadata_needed = false;
-       }
-
-       if (!trace->new_metadata_needed) {
+       if (trace->metadata_stream_state != LTTNG_LIVE_METADATA_STREAM_STATE_NEEDED) {
                goto end;
        }
 
@@ -201,7 +204,14 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
                        BT_COMP_LOGD("Metadata stream was closed by the Relay, the trace is no longer active: "
                                "trace-id=%"PRIu64", metadata-stream-id=%"PRIu64,
                                trace->id, metadata->stream_id);
+                       /*
+                        * The stream was closed and we received everything
+                        * there was to receive for this metadata stream.
+                        * We go on with the decoding of what we received. So
+                        * that data stream can be decoded.
+                        */
                        keep_receiving = false;
+                       trace->metadata_stream_state = LTTNG_LIVE_METADATA_STREAM_STATE_CLOSED;
                        break;
                case LTTNG_LIVE_GET_ONE_METADATA_STATUS_ERROR:
                        BT_COMP_LOGE_APPEND_CAUSE(self_comp,
@@ -213,15 +223,6 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
                }
        }
 
-       /*
-        * A closed metadata stream means the trace is no longer active. Return
-        * _END so that the caller can remove the trace from its list.
-        */
-       if (metadata_status == LTTNG_LIVE_GET_ONE_METADATA_STATUS_CLOSED) {
-               status = LTTNG_LIVE_ITERATOR_STATUS_END;
-               goto end;
-       }
-
        /* The memory buffer `metadata_buf` contains all the metadata. */
        if (bt_close_memstream(&metadata_buf, &size, fp)) {
                BT_COMP_LOGW_ERRNO("Metadata bt_close_memstream", ".");
@@ -234,7 +235,9 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
                        status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
                        goto end;
                }
-               trace->new_metadata_needed = false;
+
+               /* The relay sent zero bytes of metdata. */
+               trace->metadata_stream_state = LTTNG_LIVE_METADATA_STREAM_STATE_NOT_NEEDED;
                goto end;
        }
 
@@ -294,11 +297,10 @@ enum lttng_live_iterator_status lttng_live_metadata_update(
                        trace->clock_class =
                                borrow_any_clock_class(trace->trace_class);
                }
-               trace->new_metadata_needed = false;
 
-               break;
-       case CTF_METADATA_DECODER_STATUS_INCOMPLETE:
-               status = LTTNG_LIVE_ITERATOR_STATUS_AGAIN;
+               /* The metadata was updated succesfully. */
+               trace->metadata_stream_state = LTTNG_LIVE_METADATA_STREAM_STATE_NOT_NEEDED;
+
                break;
        default:
                goto error;
@@ -352,13 +354,13 @@ int lttng_live_metadata_create_stream(struct lttng_live_session *session,
                        "Failed to create CTF metadata decoder");
                goto error;
        }
-       trace = lttng_live_borrow_trace(session, ctf_trace_id);
+       trace = lttng_live_session_borrow_or_create_trace_by_id(session,
+               ctf_trace_id);
        if (!trace) {
                BT_COMP_LOGE_APPEND_CAUSE(self_comp,
                        "Failed to borrow trace");
                goto error;
        }
-       metadata->trace = trace;
        trace->metadata = metadata;
        return 0;