Changeset 80074 in vbox for trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

Timestamp:

Jul 31, 2019 2:18:34 PM (5 years ago)

Author:

vboxsync

Message:

VMM,Main,++: Retired the unfinished FTM component.

File:

• trunk/src/VBox/Main/src-client/ConsoleImpl.cpp (modified) (23 diffs)

trunk/src/VBox/Main/src-client/ConsoleImpl.cpp

@@ -118 +118 @@
 #endif /* VBOX_WITH_NETSHAPER */
 #include <VBox/vmm/mm.h>
-#include <VBox/vmm/ftm.h>
 #include <VBox/vmm/ssm.h>
 #include <VBox/err.h>
@@ -231 +230 @@
     VMPowerUpTask(Console *aConsole,
                   Progress *aProgress)
-        : VMTask(aConsole, aProgress, NULL /* aServerProgress */,
-                 false /* aUsesVMPtr */),
-          mConfigConstructor(NULL),
-          mStartPaused(false),
-          mTeleporterEnabled(FALSE),
-          mEnmFaultToleranceState(FaultToleranceState_Inactive)
+        : VMTask(aConsole, aProgress, NULL /* aServerProgress */, false /* aUsesVMPtr */)
+        , mConfigConstructor(NULL)
+        , mStartPaused(false)
+        , mTeleporterEnabled(FALSE)
     {
         m_strTaskName = "VMPwrUp";
@@ -246 +243 @@
     bool mStartPaused;
     BOOL mTeleporterEnabled;
-    FaultToleranceState_T mEnmFaultToleranceState;
 
     /* array of progress objects for hard disk reset operations */
@@ -2167 +2163 @@
             return setError(VBOX_E_INVALID_VM_STATE, tr("Cannot power down at this point in a live snapshot"));
 
-        /* Try cancel the FT sync. */
-        case MachineState_FaultTolerantSyncing:
-            if (!mptrCancelableProgress.isNull())
-            {
-                HRESULT hrc = mptrCancelableProgress->Cancel();
-                if (SUCCEEDED(hrc))
-                    break;
-            }
-            return setError(VBOX_E_INVALID_VM_STATE, tr("Cannot power down at this point in a fault tolerant sync"));
-
         /* extra nice error message for a common case */
         case MachineState_Saved:
@@ -7181 +7167 @@
         case VMSTATE_RUNNING:
         case VMSTATE_RUNNING_LS:
-        case VMSTATE_RUNNING_FT:
         case VMSTATE_RESETTING:
         case VMSTATE_RESETTING_LS:
@@ -7654 +7639 @@
 #endif
 
-        /* test the FaultToleranceState property  */
-        FaultToleranceState_T enmFaultToleranceState;
-        rc = mMachine->COMGETTER(FaultToleranceState)(&enmFaultToleranceState);
-        if (FAILED(rc))
-            throw rc;
-        BOOL fFaultToleranceSyncEnabled = (enmFaultToleranceState == FaultToleranceState_Standby);
-
         /* Create a progress object to track progress of this operation. Must
          * be done as early as possible (together with BeginPowerUp()) as this
@@ -7671 +7649 @@
         else if (fTeleporterEnabled)
             progressDesc = tr("Teleporting virtual machine");
-        else if (fFaultToleranceSyncEnabled)
-            progressDesc = tr("Fault Tolerance syncing of remote virtual machine");
         else
             progressDesc = tr("Starting virtual machine");
@@ -7752 +7728 @@
             catch (std::bad_alloc &) { throw rc = E_OUTOFMEMORY; }
         task->mTeleporterEnabled = fTeleporterEnabled;
-        task->mEnmFaultToleranceState = enmFaultToleranceState;
 
         /* Reset differencing hard disks for which autoReset is true,
@@ -7893 +7868 @@
         }
         else if (   mMachineState == MachineState_Saved
-                 || (!fTeleporterEnabled && !fFaultToleranceSyncEnabled))
+                 || !fTeleporterEnabled)
         {
             rc = pPowerupProgress->init(static_cast<IConsole *>(this),
@@ -7907 +7882 @@
                                         10   /* ulTotalOperationsWeight */,
                                         Bstr(tr("Teleporting virtual machine")).raw(),
-                                        1    /* ulFirstOperationWeight */);
-        }
-        else if (fFaultToleranceSyncEnabled)
-        {
-            rc = pPowerupProgress->init(static_cast<IConsole *>(this),
-                                        progressDesc.raw(),
-                                        TRUE /* aCancelable */,
-                                        3    /* cOperations */,
-                                        10   /* ulTotalOperationsWeight */,
-                                        Bstr(tr("Fault Tolerance syncing of remote virtual machine")).raw(),
                                         1    /* ulFirstOperationWeight */);
         }
@@ -8021 +7986 @@
         else if (fTeleporterEnabled)
             i_setMachineState(MachineState_TeleportingIn);
-        else if (enmFaultToleranceState == FaultToleranceState_Standby)
-            i_setMachineState(MachineState_FaultTolerantSyncing);
         else
             i_setMachineState(MachineState_Starting);
@@ -8121 +8084 @@
               || mMachineState == MachineState_Restoring
               || mMachineState == MachineState_TeleportingPausedVM
-              || mMachineState == MachineState_FaultTolerantSyncing
               || mMachineState == MachineState_TeleportingIn
               , ("Invalid machine state: %s\n", Global::stringifyMachineState(mMachineState)));
@@ -8136 +8098 @@
         && (   mMachineState == MachineState_Starting
             || mMachineState == MachineState_Restoring
-            || mMachineState == MachineState_FaultTolerantSyncing
             || mMachineState == MachineState_TeleportingIn)
        )
@@ -8155 +8116 @@
         && mMachineState != MachineState_TeleportingIn
         && mMachineState != MachineState_TeleportingPausedVM
-        && mMachineState != MachineState_FaultTolerantSyncing
        )
         i_setMachineState(MachineState_Stopping);
@@ -8982 +8942 @@
                 && that->mMachineState != MachineState_Restoring
                 && that->mMachineState != MachineState_TeleportingIn
-                && that->mMachineState != MachineState_FaultTolerantSyncing
                 && that->mMachineState != MachineState_TeleportingPausedVM
                 && !that->mVMIsAlreadyPoweringOff
@@ -9108 +9067 @@
                     that->i_setMachineState(MachineState_Teleported);
                     break;
-                case MachineState_FaultTolerantSyncing:
-                    /* Fault tolerant sync failed or was canceled.  Back to powered off. */
-                    that->i_setMachineState(MachineState_PoweredOff);
-                    break;
             }
             break;
@@ -9153 +9108 @@
                 case MachineState_Stopping:
                 case MachineState_TeleportingIn:
-                case MachineState_FaultTolerantSyncing:
                 case MachineState_OnlineSnapshotting:
                     /* The worker thread handles the transition. */
@@ -9205 +9159 @@
         {
             if (   enmOldState == VMSTATE_POWERING_ON
-                || enmOldState == VMSTATE_RESUMING
-                || enmOldState == VMSTATE_RUNNING_FT)
+                || enmOldState == VMSTATE_RESUMING)
             {
                 AutoWriteLock alock(that COMMA_LOCKVAL_SRC_POS);
@@ -9221 +9174 @@
                                || that->mMachineState == MachineState_Saving
                               )
-                           && enmOldState == VMSTATE_RESUMING)
-                       || (   that->mMachineState == MachineState_FaultTolerantSyncing
-                           && enmOldState == VMSTATE_RUNNING_FT));
+                           && enmOldState == VMSTATE_RESUMING));
 
                 that->i_setMachineState(MachineState_Running);
@@ -9234 +9185 @@
             AssertMsg(   that->mMachineState == MachineState_LiveSnapshotting
                       || that->mMachineState == MachineState_Teleporting,
-                      ("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState),
-                      VMR3GetStateName(enmOldState), VMR3GetStateName(enmState) ));
-            break;
-
-        case VMSTATE_RUNNING_FT:
-            AssertMsg(that->mMachineState == MachineState_FaultTolerantSyncing,
                       ("%s/%s -> %s\n", Global::stringifyMachineState(that->mMachineState),
                       VMR3GetStateName(enmOldState), VMR3GetStateName(enmState) ));
@@ -10210 +10155 @@
 }
 
-/**
- * Progress cancelation callback for fault tolerance VM poweron
- */
-static void faultToleranceProgressCancelCallback(void *pvUser)
-{
-    PUVM pUVM = (PUVM)pvUser;
-
-    if (pUVM)
-        FTMR3CancelStandby(pUVM);
-}
 
 /**
@@ -10292 +10227 @@
          *       SessionMachine::i_setMachineState() when the VM is powered down.
          */
-        if (    !pTask->mTeleporterEnabled
-            &&  pTask->mEnmFaultToleranceState != FaultToleranceState_Standby)
+        if (!pTask->mTeleporterEnabled)
         {
             rc = pConsole->mControl->LockMedia();
@@ -10516 +10450 @@
                         pConsole->mptrExtPackManager->i_callAllVmPowerOffHooks(pConsole, pVM);
 #endif
-                    }
-                }
-                else if (pTask->mEnmFaultToleranceState != FaultToleranceState_Inactive)
-                {
-                    /*
-                     * Get the config.
-                     */
-                    ULONG uPort;
-                    rc = pMachine->COMGETTER(FaultTolerancePort)(&uPort);
-                    if (SUCCEEDED(rc))
-                    {
-                        ULONG uInterval;
-                        rc = pMachine->COMGETTER(FaultToleranceSyncInterval)(&uInterval);
-                        if (SUCCEEDED(rc))
-                        {
-                            Bstr bstrAddress;
-                            rc = pMachine->COMGETTER(FaultToleranceAddress)(bstrAddress.asOutParam());
-                            if (SUCCEEDED(rc))
-                            {
-                                Bstr bstrPassword;
-                                rc = pMachine->COMGETTER(FaultTolerancePassword)(bstrPassword.asOutParam());
-                                if (SUCCEEDED(rc))
-                                {
-                                    if (pTask->mProgress->i_setCancelCallback(faultToleranceProgressCancelCallback,
-                                                                              pConsole->mpUVM))
-                                    {
-                                        if (SUCCEEDED(rc))
-                                        {
-                                            Utf8Str strAddress(bstrAddress);
-                                            const char *pszAddress = strAddress.isEmpty() ? NULL : strAddress.c_str();
-                                            Utf8Str strPassword(bstrPassword);
-                                            const char *pszPassword = strPassword.isEmpty() ? NULL : strPassword.c_str();
-
-                                            /* Power on the FT enabled VM. */
-#ifdef VBOX_WITH_EXTPACK
-                                            vrc = pConsole->mptrExtPackManager->i_callAllVmPowerOnHooks(pConsole, pVM);
-#endif
-                                            if (RT_SUCCESS(vrc))
-                                                vrc = FTMR3PowerOn(pConsole->mpUVM,
-                                                                   pTask->mEnmFaultToleranceState == FaultToleranceState_Master /* fMaster */,
-                                                                   uInterval,
-                                                                   pszAddress,
-                                                                   uPort,
-                                                                   pszPassword);
-                                            AssertLogRelRC(vrc);
-                                        }
-                                        pTask->mProgress->i_setCancelCallback(NULL, NULL);
-                                    }
-                                    else
-                                        rc = E_FAIL;
-
-                                }
-                            }
-                        }
                     }
                 }