Add kernel parameter for udpcast maximum wait time in case hosts can'…

…t join a multicast session
FOGProject · Oct 7, 2022 · 45a6120 · 45a6120
1 parent c6dad41
commit 45a6120
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/packages/web/lib/fog/bootmenu.class.php b/packages/web/lib/fog/bootmenu.class.php
@@ -885,14 +885,16 @@ public function falseTasking($mc = false, $Image = false)
             'FOG_KERNEL_ARGS',
             'FOG_KERNEL_DEBUG',
             'FOG_MULTICAST_RENDEZVOUS',
-            'FOG_NONREG_DEVICE'
+            'FOG_NONREG_DEVICE',
+            'FOG_UDPCAST_MAXWAIT'
         );
         list(
             $chkdsk,
             $kargs,
             $kdebug,
             $mcastrdv,
-            $nondev
+            $nondev,
+            $mcastmaxwait
         ) = self::getSubObjectIDs(
             'Service',
             array(
@@ -915,6 +917,9 @@ public function falseTasking($mc = false, $Image = false)
                 $_REQUEST['extraargs']
             );
         }
+        if (!is_numeric($mcastmaxwait)) {
+            $mcastmaxwait = 10;
+        }
         $StorageGroup = $Image->getStorageGroup();
         $StorageNode = $StorageGroup->getOptimalStorageNode();
         $osid = $Image->get('osID');
@@ -961,7 +966,7 @@ public function falseTasking($mc = false, $Image = false)
                 'active' => !self::$Host || !self::$Host->isValid(),
             ),
             array(
-                'value' => "port=$port mc=yes",
+                'value' => "port=$port mcastMaxWait=$mcastmaxwait mc=yes",
                 'active' => $mc,
             ),
             array(
@@ -1471,6 +1476,7 @@ public function getTasking()
                     'FOG_MULTICAST_RENDEZVOUS',
                     'FOG_PIGZ_COMP',
                     'FOG_TFTP_HOST',
+                    'FOG_UDPCAST_MAXWAIT',
                     'FOG_WIPE_TIMEOUT'
                 );
                 list(
@@ -1483,6 +1489,7 @@ public function getTasking()
                     $mcastrdv,
                     $pigz,
                     $tftp,
+                    $mcastmaxwait,
                     $timeout
                 ) = self::getSubObjectIDs(
                     'Service',
@@ -1506,6 +1513,9 @@ public function getTasking()
                         $_REQUEST['extraargs']
                     );
                 }
+                if (!is_numeric($mcastmaxwait)) {
+                    $mcastmaxwait = 10;
+                }
                 $globalPIGZ = $pigz;
                 $PIGZ_COMP = $globalPIGZ;
                 if ($StorageNode instanceof StorageNode && $StorageNode->isValid()) {
@@ -1725,12 +1735,13 @@ public function getTasking()
                 ),
                 array(
                     'value' => sprintf(
-                        'port=%s',
+                        'port=%s mcastMaxWait=%s',
                         (
                             $TaskType->isMulticast() ?
                             $MulticastSession->get('port') :
                             null
-                        )
+                        ),
+                        $mcastmaxwait
                     ),
                     'active' => $TaskType->isMulticast(),
                 ),

diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '1.5.9.187');
+        define('FOG_VERSION', '1.5.9.188');
         define('FOG_SCHEMA', 270);
         define('FOG_BCACHE_VER', 139);
         define('FOG_CLIENT_VERSION', '0.12.2');