Merge pull request #9152 from kaltura/Orion-15.17.0-PLAT-10610-avoidV…

…alidateNGesn Orion-15.17.0-PLAT-10610: avoid validation of NG live entry server node
kaltura · Feb 4, 2020 · 283217e · 283217e
2 parents e364e43 + d6ff62a
commit 283217e
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 9 deletions.
diff --git a/alpha/apps/kaltura/lib/model/objectfilters/EntryServerNodeFilter.class.php b/alpha/apps/kaltura/lib/model/objectfilters/EntryServerNodeFilter.class.php
@@ -23,6 +23,7 @@ public function init()
 			'_in_status',
 			'_eq_server_type',
 			'_in_server_type',
+			'_notin_server_type',
 		), null);
 
 		$this->allowed_order_fields = array(

diff --git a/api_v3/lib/types/EntryServerNode/base/KalturaEntryServerNode.php b/api_v3/lib/types/EntryServerNode/base/KalturaEntryServerNode.php
@@ -57,7 +57,7 @@ abstract class KalturaEntryServerNode extends KalturaObject implements IFilterab
 	/**
 	 * @var KalturaEntryServerNodeType
 	 * @readonly
-	 * @filter eq,in
+	 * @filter eq,in,notin
 	 */
 	public $serverType;
 

diff --git a/api_v3/lib/types/EntryServerNode/base/filters/base/KalturaEntryServerNodeBaseFilter.php b/api_v3/lib/types/EntryServerNode/base/filters/base/KalturaEntryServerNodeBaseFilter.php
@@ -20,6 +20,7 @@ abstract class KalturaEntryServerNodeBaseFilter extends KalturaFilter
 		"statusIn" => "_in_status",
 		"serverTypeEqual" => "_eq_server_type",
 		"serverTypeIn" => "_in_server_type",
+		"serverTypeNotIn" => "_notin_server_type",
 	);
 
 	static private $order_by_map = array
@@ -100,4 +101,10 @@ public function getOrderByMap()
 	 * @var string
 	 */
 	public $serverTypeIn;
+
+	/**
+	 * @dynamicType KalturaEntryServerNodeType
+	 * @var string
+	 */
+	public $serverTypeNotIn;
 }
diff --git a/batch/batches/ValidateLiveMediaServers/KAsyncValidateLiveMediaServers.class.php b/batch/batches/ValidateLiveMediaServers/KAsyncValidateLiveMediaServers.class.php
@@ -12,7 +12,7 @@
  */
 class KAsyncValidateLiveMediaServers extends KPeriodicWorker
 {
-	const ENTRY_SERVER_NODE_MIN_CREATION_TIMEE = 120;
+	const ENTRY_SERVER_NODE_MIN_CREATION_TIME = 120;
 
 	/* (non-PHPdoc)
 	 * @see KBatchBase::getType()
@@ -21,19 +21,31 @@ public static function getType()
 	{
 		return KalturaBatchJobType::CLEANUP;
 	}
+
+    protected function getFilter()
+    {
+        $entryServerNodeMinCreationTime = $this->getAdditionalParams("minCreationTime");
+        if(!$entryServerNodeMinCreationTime)
+            $entryServerNodeMinCreationTime = self::ENTRY_SERVER_NODE_MIN_CREATION_TIME;
+
+        $entryServerNodeFilter = new KalturaEntryServerNodeFilter();
+        $entryServerNodeFilter->orderBy = KalturaEntryServerNodeOrderBy::CREATED_AT_ASC;
+        $entryServerNodeFilter->createdAtLessThanOrEqual = time() - $entryServerNodeMinCreationTime;
+
+        $serverTypesNotIn = $this->getAdditionalParams("serverTypesNotIn");
+        if ($serverTypesNotIn)
+        {
+            $entryServerNodeFilter->serverTypeNotIn = $serverTypesNotIn;
+        }
+        return $entryServerNodeFilter;
+    }
 
 	/* (non-PHPdoc)
 	 * @see KBatchBase::run()
 	*/
 	public function run($jobs = null)
 	{
-		$entryServerNodeMinCreationTime = $this->getAdditionalParams("minCreationTime");
-		if(!$entryServerNodeMinCreationTime)
-			$entryServerNodeMinCreationTime = self::ENTRY_SERVER_NODE_MIN_CREATION_TIMEE;
-
-		$entryServerNodeFilter = new KalturaEntryServerNodeFilter();
-		$entryServerNodeFilter->orderBy = KalturaEntryServerNodeOrderBy::CREATED_AT_ASC;
-		$entryServerNodeFilter->createdAtLessThanOrEqual = time() - $entryServerNodeMinCreationTime;
+		$entryServerNodeFilter = $this->getFilter();
 
 		$entryServerNodePager = new KalturaFilterPager();
 		$entryServerNodePager->pageSize = 500;