Fix: make sure no index is in flight before using inactivity beacons

[lttng-tools.git] / src / bin / lttng-relayd / main.c

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index a3b8016db46d157dc44f478553011f489b60c591..fa5a7db86c393640c15fe9e8b3bf5f652da98111 100644 (file)
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -1944,9 +1944,10 @@ int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr,
                DBG("Received live beacon for stream %" PRIu64, stream->stream_handle);
 
                /*
                DBG("Received live beacon for stream %" PRIu64, stream->stream_handle);
 
                /*

-                * Only flag a stream inactive when it has already received data.
+                * Only flag a stream inactive when it has already received data
+                * and no indexes are in flight.

                 */
                 */

-               if (stream->total_index_received > 0) {
+               if (stream->total_index_received > 0 && stream->indexes_in_flight == 0) {

                        stream->beacon_ts_end = be64toh(index_info.timestamp_end);
                }
                ret = 0;
                        stream->beacon_ts_end = be64toh(index_info.timestamp_end);
                }
                ret = 0;


@@ -1963,6 +1964,7 @@ int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr,
                        goto end_rcu_unlock;
                }
                index_created = 1;
                        goto end_rcu_unlock;
                }
                index_created = 1;

+               stream->indexes_in_flight++;

        }
 
        copy_index_control_data(index, &index_info);
        }
 
        copy_index_control_data(index, &index_info);


@@ -1993,6 +1995,8 @@ int relay_recv_index(struct lttcomm_relayd_hdr *recv_hdr,
                        goto end_rcu_unlock;
                }
                stream->total_index_received++;
                        goto end_rcu_unlock;
                }
                stream->total_index_received++;

+               stream->indexes_in_flight--;
+               assert(stream->indexes_in_flight >= 0);

        }
 
 end_rcu_unlock:
        }
 
 end_rcu_unlock:


@@ -2156,6 +2160,7 @@ static int handle_index_data(struct relay_stream *stream, uint64_t net_seq_num,
                        goto error;
                }
                index_created = 1;
                        goto error;
                }
                index_created = 1;

+               stream->indexes_in_flight++;

        }
 
        if (rotate_index || stream->index_fd < 0) {
        }
 
        if (rotate_index || stream->index_fd < 0) {


@@ -2198,6 +2203,8 @@ static int handle_index_data(struct relay_stream *stream, uint64_t net_seq_num,
                        goto error;
                }
                stream->total_index_received++;
                        goto error;
                }
                stream->total_index_received++;

+               stream->indexes_in_flight--;
+               assert(stream->indexes_in_flight >= 0);

        }
 
 error:
        }
 
 error: