[multicat-devel] [Git][videolan/multicat][master] 2 commits: Fix multilive race

[Christophe Massiot]

Christophe Massiot pushed to branch master at VideoLAN / multicat


Commits:
d622c1ee by Arnaud de Turckheim at 2019-09-27T08:31:20Z
Fix multilive race

Depending on the skew value and announce periodicity, the master
expiration date might be reset all the time. In this case multilive will
never get up.

- - - - -
f1bcedba by Christophe Massiot at 2019-09-27T11:16:35Z
Merge branch 'quarium-multilive'

- - - - -


1 changed file:

- multilive.c


Changes:

=====================================
multilive.c
=====================================
@@ -315,9 +315,14 @@ int main( int i_argc, char **pp_argv )
 
             if ( announce_get_priority(p_buffer) < i_priority )
             {
-                /* Do not take over immediately to avoid fighting with
-                 * potential other idle nodes. */
-                i_master_expiration = i_current_date + i_master_expiration_skew;
+                if ( i_current_date + i_master_expiration_skew <
+                    i_master_expiration )
+                {
+                    /* Do not take over immediately to avoid fighting with
+                     * potential other idle nodes. */
+                    i_master_expiration =
+                        i_current_date + i_master_expiration_skew;
+                }
             }
             else
             {



View it on GitLab: https://code.videolan.org/videolan/multicat/compare/d50d3d064eeb6f8667034c6ab2dec0f2a73d1c2d...f1bcedba28abbb307538ee5f1e1fd66e37e67b2e

-- 
View it on GitLab: https://code.videolan.org/videolan/multicat/compare/d50d3d064eeb6f8667034c6ab2dec0f2a73d1c2d...f1bcedba28abbb307538ee5f1e1fd66e37e67b2e
You're receiving this email because of your account on code.videolan.org.