Fix replication issue.

Replication for both images and snapins was broken during the switch to methodized calls for looping. In regards to snapins and images, we have to iterate the snapins and images iteratively twice. Forgetting this, the issue occurred because the secondary variable did not exist. Reset to use the variable method (which limits sql calls.)
FOGProject · Jan 5, 2017 · a03f451 · a03f451
1 parent 7289b88
commit a03f451
Show file tree

Hide file tree

Showing 13 changed files with 739 additions and 743 deletions.
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', '8');
+        define('FOG_VERSION', '9');
         define('FOG_SCHEMA', 245);
         define('FOG_BCACHE_VER', 111);
         define('FOG_SVN_REVISION', 6052);

diff --git a/packages/web/lib/service/imagereplicator.class.php b/packages/web/lib/service/imagereplicator.class.php
@@ -91,8 +91,7 @@ public function __construct()
     private function _commonOutput()
     {
         try {
-            $StorageNodes = $this->checkIfNodeMaster();
-            foreach ((array)$StorageNodes as &$StorageNode) {
+            foreach ((array)$this->checkIfNodeMaster() as &$StorageNode) {
                 self::wlog(
                     sprintf(
                         '* %s',
@@ -208,8 +207,9 @@ private function _commonOutput()
                     ),
                     'imageID'
                 );
-                foreach ((array)self::getClass('ImageManager')
-                    ->find(array('id' => $imageIDs)) as &$Image
+                $Images = (array)self::getClass('ImageManager')
+                    ->find(array('id' => $imageIDs));
+                foreach ($Images as &$Image
                 ) {
                     if (!$Image->getPrimaryGroup($myStorageGroupID)) {
                         self::outall(

diff --git a/packages/web/lib/service/multicastmanager.class.php b/packages/web/lib/service/multicastmanager.class.php
@@ -169,10 +169,7 @@ private function _serviceLoop()
             );
             try {
                 $StorageNodes = $this->checkIfNodeMaster();
-                foreach ((array)$StorageNodes as &$StorageNode) {
-                    if (!$StorageNode->isValid()) {
-                        continue;
-                    }
+                foreach ((array)$this->checkIfNodeMaster() as &$StorageNode) {
                     $myroot = $StorageNode->get('path');
                     $RMTasks = array();
                     foreach ((array)$KnownTasks as &$mcTask) {

diff --git a/packages/web/lib/service/snapinhash.class.php b/packages/web/lib/service/snapinhash.class.php
@@ -91,8 +91,7 @@ public function __construct()
     private function _commonOutput()
     {
         try {
-            $StorageNodes = $this->checkIfNodeMaster();
-            foreach ((array)$StorageNodes as &$StorageNode) {
+            foreach ((array)$this->checkIfNodeMaster() as &$StorageNode) {
                 $myStorageGroupID = $StorageNode->get('storagegroupID');
                 $myStorageNodeID = $StorageNode->get('id');
                 $StorageGroup = $StorageNode->getStorageGroup();

diff --git a/packages/web/lib/service/snapinreplicator.class.php b/packages/web/lib/service/snapinreplicator.class.php
@@ -91,8 +91,7 @@ public function __construct()
     private function _commonOutput()
     {
         try {
-            $StorageNodes = $this->checkIfNodeMaster();
-            foreach ((array)$StorageNodes as &$StorageNode) {
+            foreach ((array)$this->checkIfNodeMaster() as &$StorageNode) {
                 self::wlog(
                     sprintf(
                         ' * %s',
@@ -208,8 +207,9 @@ private function _commonOutput()
                     ),
                     'snapinID'
                 );
-                foreach ((array)self::getClass('SnapinManager')
-                    ->find(array('id' => $snapinIDs)) as &$Snapin
+                $Snapins = (array)self::getClass('SnapinManager')
+                    ->find(array('id' => $snapinIDs));
+                foreach ($Snapins as &$Snapin
                 ) {
                     if (!$Snapin->getPrimaryGroup($myStorageGroupID)) {
                         self::outall(