Merge pull request #432 from dappnode/remove-external-vols

Remove external vols

Author: dapplion

packages/admin-ui/server-mock/data/sample.ts

@@ -76,8 +76,6 @@ export const sampleDnp: InstalledPackageDetailData = {
   gettingStarted: "",
   gettingStartedShow: true,
   areThereVolumesToRemove: false,
-  volumeUsersToRemove: [],
   dependantsOf: [],
-  namedExternalVols: [],
   containers: []
 };

packages/admin-ui/src/common/types.ts

@@ -429,13 +429,7 @@ export interface InstalledPackageDetailData extends InstalledPackageData {
    * Checks if there are volumes to be removed on this DNP
    */
   areThereVolumesToRemove: boolean;
-  /**
-   * If there are volumes which this DNP is the owner and some other
-   * DNPs are users, they will be removed by the DAPPMANAGER.
-   */
-  volumeUsersToRemove: string[];
   dependantsOf: string[];
-  namedExternalVols: VolumeOwnershipData[];
   // Non-indexed data
   manifest?: Manifest;
 }
@@ -455,7 +449,6 @@ interface ManifestImage {
   size: number;
   path: string;
   volumes?: string[];
-  external_vol?: string[];
   ports?: string[];
   environment?: string[];
   restart?: string;
@@ -482,8 +475,8 @@ export interface ManifestWithImage extends Manifest {
 export interface ComposeVolumes {
   // volumeName: "dncore_ipfsdnpdappnodeeth_data"
   [volumeName: string]: {
-    // Allowed to user
-    external?: boolean | { name: string }; // name: "dncore_ipfsdnpdappnodeeth_data"
+    // FORBIDDEN
+    // external?: boolean | { name: string }; // name: "dncore_ipfsdnpdappnodeeth_data"
     // NOT allowed to user, only used by DAppNode internally (if any)
     name?: string; // Volumes can only be declared locally or be external
     driver?: string; // Dangerous
@@ -917,7 +910,6 @@ export interface PackageReleaseImageData {
   ports?: string[];
   environment?: string[];
   // Non-mergable properties
-  external_vol?: string[];
   restart?: string;
   privileged?: boolean;
   cap_add?: string[];
@@ -944,7 +936,6 @@ export interface MountpointData {
 export interface VolumeOwnershipData {
   name: string; // "gethdnpdappnodeeth_geth", Actual name to call delete on
   owner?: string; // "geth.dnp.dappnode.eth", Actual name of the owner
-  users: string[]; // ["geth.dnp.dappnode.eth", "dependency.dnp.dappnode.eth"]
 }
 
 export interface VolumeData extends VolumeOwnershipData {

packages/admin-ui/src/pages/packages/components/Info/RemovePackage.tsx

@@ -19,13 +19,7 @@ interface WarningItem {
 }
 
 export function RemovePackage({ dnp }: { dnp: InstalledPackageDetailData }) {
-  const {
-    dnpName,
-    areThereVolumesToRemove,
-    volumeUsersToRemove,
-    dependantsOf,
-    isCore
-  } = dnp;
+  const { dnpName, areThereVolumesToRemove, dependantsOf, isCore } = dnp;
 
   const history = useHistory();
 
@@ -60,15 +54,6 @@ export function RemovePackage({ dnp }: { dnp: InstalledPackageDetailData }) {
       });
     }
 
-    // dnpsToRemove = "raiden.dnp.dappnode.eth, another.dnp.dappnode.eth"
-    if (volumeUsersToRemove.length > 0) {
-      const volumeUsersToRemoveList = markdownList(volumeUsersToRemove);
-      dnpsToRemoveWarningsList.push({
-        title: "Warning! Other packages to be removed",
-        body: `Some other DAppNode Packages will be removed as well because they are dependent on ${dnpName} volumes. \n\n ${volumeUsersToRemoveList}`
-      });
-    }
-
     if (dnpsToRemoveWarningsList.length > 0)
       await new Promise(resolve =>
         confirm({

packages/admin-ui/src/pages/packages/components/Info/VolumesList.tsx

@@ -12,7 +12,6 @@ import {
   prettyBytes,
   shortNameCapitalized as sn
 } from "utils/format";
-import { markdownList } from "utils/markdown";
 import { InstalledPackageDetailData } from "common";
 import "./volumesList.scss";
 
@@ -24,24 +23,11 @@ interface WarningItem {
 export const VolumesList = ({ dnp }: { dnp: InstalledPackageDetailData }) => {
   const [showAll, setShowAll] = useState(false);
 
-  const { dnpName, volumeUsersToRemove } = dnp;
+  const { dnpName } = dnp;
 
   async function packageRestartVolumes(volumeName?: string) {
     const warningsList: WarningItem[] = [];
 
-    /**
-     * If there are volumes which this DNP is the owner and some other
-     * DNPs are users, they will be removed by the DAPPMANAGER.
-     * Alert the user about this fact
-     */
-    if (volumeUsersToRemove.length > 0) {
-      const volumeUsersToRemoveList = markdownList(volumeUsersToRemove);
-      warningsList.push({
-        title: "Warning! DAppNode Packages to be removed",
-        body: `Some other DAppNode Packages will be reseted in order to remove ${dnpName} volumes. \n\n ${volumeUsersToRemoveList}`
-      });
-    }
-
     // If there are NOT conflicting volumes,
     // Display a dialog to confirm volumes reset
     await new Promise(resolve =>

packages/admin-ui/src/pages/system/actions.ts

@@ -5,15 +5,10 @@ import { getEthClientPrettyName } from "components/EthMultiClient";
 // External actions
 import { fetchPasswordIsSecure } from "services/dappnodeStatus/actions";
 // Selectors
-import { getDnpInstalledByDnpName } from "services/dnpInstalled/selectors";
-import {
-  getEthClientTarget,
-  getVolumes
-} from "services/dappnodeStatus/selectors";
+import { getEthClientTarget } from "services/dappnodeStatus/selectors";
 import { EthClientTarget } from "types";
 import { withToastNoThrow } from "components/toast/Toast";
 import { AppThunk } from "store";
-import { markdownList } from "utils/markdown";
 
 // Redux Thunk actions
 
@@ -108,33 +103,13 @@ export const volumeRemove = (name: string): AppThunk => async dispatch => {
 export const packageVolumeRemove = (
   dnpName: string,
   volName: string
-): AppThunk => async (dispatch, getState) => {
+): AppThunk => async () => {
   // Make sure there are no colliding volumes with this DNP
-  const dnp = getDnpInstalledByDnpName(getState(), dnpName);
-  const volumesData = getVolumes(getState());
   const prettyDnpName = shortNameCapitalized(dnpName);
   const prettyVolName = prettyVolumeName(volName, dnpName).name;
   const prettyVolRef = `${prettyDnpName} ${prettyVolName} volume`;
 
   const warningsList: { title: string; body: string }[] = [];
-  /**
-   * If there are volumes which this DNP is the owner and some other
-   * DNPs are users, they will be removed by the DAPPMANAGER.
-   * Alert the user about this fact
-   */
-  if (dnp) {
-    const vol = volumesData.find(v => v.name === volName);
-    if (vol && vol.users) {
-      const externalUsers = vol.users.filter(d => d !== dnpName);
-      if (externalUsers.length > 0) {
-        const externalUsersList = markdownList(externalUsers);
-        warningsList.push({
-          title: "Warning! DAppNode Packages to be removed",
-          body: `Some other DAppNode Packages will be reseted in order to remove ${prettyVolRef}. \n\n ${externalUsersList}`
-        });
-      }
-    }
-  }
 
   // If there are NOT conflicting volumes,
   // Display a dialog to confirm volumes reset

packages/admin-ui/src/services/dnpInstalled/selectors.ts

@@ -5,10 +5,3 @@ import { InstalledPackageData } from "types";
 
 export const getDnpInstalled = (state: RootState): InstalledPackageData[] =>
   state.dnpInstalled.dnpInstalled;
-
-/**
- * Regular selectors, called outside of a normal react-redux situation
- */
-
-export const getDnpInstalledByDnpName = (state: RootState, dnpName: string) =>
-  getDnpInstalled(state).find(dnp => dnp.dnpName === dnpName);

packages/dappmanager/src/calls/packageGet.ts

@@ -6,7 +6,6 @@ import { InstalledPackageDetailData } from "../types";
 import { logs } from "../logs";
 import { ComposeFileEditor } from "../modules/compose/editor";
 import { getVolumesOwnershipData } from "../modules/docker/volumesData";
-import { getDnpsToRemoveAll } from "../modules/docker/restartPackageVolumes";
 
 /**
  * Toggles the visibility of a getting started block
@@ -24,9 +23,6 @@ export async function packageGet({
   if (!dnp) throw Error(`No DNP was found for name ${dnpName}`);
   const volumesData = await getVolumesOwnershipData();
 
-  // Metadata for package/:id/controls feedback
-  const { dnpsToRemove } = getDnpsToRemoveAll(dnp, volumesData);
-
   const dnpData: InstalledPackageDetailData = {
     ...dnp,
 
@@ -38,13 +34,9 @@ export async function packageGet({
           return !owner || owner === dnp.dnpName;
         })
       ),
-    volumeUsersToRemove: dnpsToRemove.filter(name => name !== dnp.dnpName),
     dependantsOf: dnpList
       .filter(d => d.dependencies[dnpName])
-      .map(d => d.dnpName),
-    namedExternalVols: volumesData.filter(
-      v => v.owner && v.owner !== dnp.dnpName && v.users.includes(dnp.dnpName)
-    )
+      .map(d => d.dnpName)
   };
 
   // Add non-blocking data

packages/dappmanager/src/calls/packageRemove.ts

@@ -1,13 +1,14 @@
 import fs from "fs";
 import * as eventBus from "../eventBus";
 import params from "../params";
-// Modules
-import { dockerComposeDown, dockerRm } from "../modules/docker/dockerCommands";
-// Utils
+import {
+  dockerComposeDown,
+  dockerRm,
+  dockerStop
+} from "../modules/docker/dockerCommands";
 import * as getPath from "../utils/getPath";
 import shell from "../utils/shell";
 import { listPackage } from "../modules/docker/listContainers";
-import { restartPackageVolumes } from "../modules/docker/restartPackageVolumes";
 import { logs } from "../logs";
 
 /**
@@ -33,54 +34,39 @@ export async function packageRemove({
     throw Error("Core packages cannot be cannot be removed");
   }
 
-  // Only no-cores will
+  // Only no-cores reach this block
   const composePath = getPath.dockerCompose(dnp.dnpName, false);
   const packageRepoDir = getPath.packageRepoDir(dnp.dnpName, false);
 
-  // Necessary for eventBus dependants to know the exact list of deleted DNPs
-  let removedDnps: string[] = [dnp.dnpName];
+  // [NOTE] Not necessary to close the ports since they will just
+  // not be renewed in the next interval
 
-  /**
-   * [NOTE] Not necessary to close the ports since they will just
-   * not be renewed in the next interval
-   */
-
-  // Call restartPackageVolumes to safely delete dependant volumes
-  if (deleteVolumes) {
-    // Note: restartPackageVolumes may remove additional DNPs
-    removedDnps = (
-      await restartPackageVolumes({
-        dnpName: dnp.dnpName,
-        doNotRestart: true
-      })
-    ).removedDnps;
-  } else {
-    /**
-     * If there is no docker-compose, do a docker rm directly
-     * Otherwise, try to do a docker-compose down and if it fails,
-     * log to console and do docker-rm
-     */
-    if (fs.existsSync(composePath))
-      try {
-        await dockerComposeDown(composePath, {
-          volumes: deleteVolumes,
-          timeout
-        });
-      } catch (e) {
-        logs.error(`Error on dockerComposeDown of ${dnp.dnpName}`, e);
-        for (const container of dnp.containers)
-          await dockerRm(container.containerName, { volumes: deleteVolumes });
-      }
-    else {
-      for (const container of dnp.containers)
-        await dockerRm(container.containerName, { volumes: deleteVolumes });
+  // If there is no docker-compose, do a docker rm directly
+  // Otherwise, try to do a docker-compose down and if it fails,
+  // log to console and do docker-rm
+  let hasRemoved = false;
+  if (fs.existsSync(composePath)) {
+    try {
+      await dockerComposeDown(composePath, {
+        volumes: deleteVolumes,
+        timeout
+      });
+      hasRemoved = true; // To mimic an early return
+    } catch (e) {
+      logs.error(`Error on dockerComposeDown of ${dnp.dnpName}`, e);
     }
   }
 
+  if (!hasRemoved) {
+    const containerNames = dnp.containers.map(c => c.containerName);
+    await dockerStop(containerNames, { time: timeout });
+    await dockerRm(containerNames, { volumes: deleteVolumes });
+  }
+
   // Remove DNP folder and files
   if (fs.existsSync(packageRepoDir)) await shell(`rm -r ${packageRepoDir}`);
 
   // Emit packages update
   eventBus.requestPackages.emit();
-  eventBus.packagesModified.emit({ dnpNames: removedDnps, removed: true });
+  eventBus.packagesModified.emit({ dnpNames: [dnp.dnpName], removed: true });
 }