fix conflict

Author: apinnick

migration/migrating_3_4/troubleshooting-3-4.adoc

@@ -20,6 +20,8 @@ include::modules/migration-using-mig-log-reader.adoc[leveloffset=+1]
 include::modules/migration-downloading-logs.adoc[leveloffset=+1]
 include::modules/migration-updating-deprecated-gvks.adoc[leveloffset=+1]
 include::modules/migration-error-messages.adoc[leveloffset=+1]
+include::modules/migration-dvm-error-node-selectors.adoc[leveloffset=+1]
+include::modules/migration-using-must-gather.adoc[leveloffset=+1]
 
 [id="rolling-back-migration_{context}"]
 == Rolling back a migration
@@ -29,7 +31,6 @@ You can roll back a migration by using the {mtc-short} web console or the CLI.
 include::modules/migration-rolling-back-migration-web-console.adoc[leveloffset=+2]
 include::modules/migration-rolling-back-migration-cli.adoc[leveloffset=+2]
 
-include::modules/migration-using-must-gather.adoc[leveloffset=+1]
 include::modules/migration-known-issues.adoc[leveloffset=+1]
 
 [role="_additional-resources"]

migration/migrating_4_1_4/troubleshooting-4-1-4.adoc

@@ -19,6 +19,8 @@ include::modules/migration-viewing-migration-crs.adoc[leveloffset=+1]
 include::modules/migration-using-mig-log-reader.adoc[leveloffset=+1]
 include::modules/migration-downloading-logs.adoc[leveloffset=+1]
 include::modules/migration-error-messages.adoc[leveloffset=+1]
+include::modules/migration-dvm-error-node-selectors.adoc[leveloffset=+1]
+include::modules/migration-using-must-gather.adoc[leveloffset=+1]
 
 [id="rolling-back-migration_{context}"]
 == Rolling back a migration
@@ -28,7 +30,6 @@ You can roll back a migration by using the {mtc-short} web console or the CLI.
 include::modules/migration-rolling-back-migration-web-console.adoc[leveloffset=+2]
 include::modules/migration-rolling-back-migration-cli.adoc[leveloffset=+2]
 
-include::modules/migration-using-must-gather.adoc[leveloffset=+1]
 include::modules/migration-known-issues.adoc[leveloffset=+1]
 
 [role="_additional-resources"]

migration/migrating_4_2_4/troubleshooting-4-2-4.adoc

@@ -19,6 +19,8 @@ include::modules/migration-viewing-migration-crs.adoc[leveloffset=+1]
 include::modules/migration-using-mig-log-reader.adoc[leveloffset=+1]
 include::modules/migration-downloading-logs.adoc[leveloffset=+1]
 include::modules/migration-error-messages.adoc[leveloffset=+1]
+include::modules/migration-dvm-error-node-selectors.adoc[leveloffset=+1]
+include::modules/migration-using-must-gather.adoc[leveloffset=+1]
 
 [id="rolling-back-migration_{context}"]
 == Rolling back a migration
@@ -28,7 +30,6 @@ You can roll back a migration by using the {mtc-short} web console or the CLI.
 include::modules/migration-rolling-back-migration-web-console.adoc[leveloffset=+2]
 include::modules/migration-rolling-back-migration-cli.adoc[leveloffset=+2]
 
-include::modules/migration-using-must-gather.adoc[leveloffset=+1]
 include::modules/migration-known-issues.adoc[leveloffset=+1]
 
 [role="_additional-resources"]

modules/migration-dvm-error-node-selectors.adoc

@@ -0,0 +1,61 @@
+// Module included in the following assemblies:
+// * migration/migrating_3_4/troubleshooting-3-4.adoc
+// * migration/migrating_4_1_4/troubleshooting-4-1-4.adoc
+// * migration/migrating_4_2_4/troubleshooting-4-2-4.adoc
+
+[id="migration-dvm-error-node-selectors_{context}"]
+= Direct volume migration does not complete
+
+If direct volume migration does not complete, the target cluster might not have the same `node-selector` annotations as the source cluster.
+
+{mtc-full} ({mtc-short}) migrates namespaces with all annotations in order to preserve security context constraints and scheduling requirements. During direct volume migration, {mtc-short} creates Rsync transfer pods on the target cluster in the namespaces that were migrated from the source cluster. If a target cluster namespace does not have the same annotations as the source cluster namespace, the Rsync transfer pods cannot be scheduled. The Rsync pods remain in a `Pending` state.
+
+You can identify and fix this issue by performing the following procedure.
+
+.Procedure
+
+. Check the status of the `MigMigration` CR:
++
+[source,terminal]
+----
+$ oc describe migmigration <pod_name> -n openshift-migration
+----
++
+The output includes the following status message:
++
+.Example output
+[source,terminal]
+----
+...
+Some or all transfer pods are not running for more than 10 mins on destination cluster
+...
+----
+
+. On the source cluster, obtain the details of a migrated namespace:
++
+[source,terminal]
+----
+$ oc get namespace <namespace> -o yaml <1>
+----
+<1> Specify the migrated namespace.
+
+. On the target cluster, edit the migrated namespace:
++
+[source,terminal]
+----
+$ oc edit namespace <namespace>
+----
+
+. Add missing `openshift.io/node-selector` annotations to the migrated namespace as in the following example:
++
+[source,yaml]
+----
+apiVersion: v1
+kind: Namespace
+metadata:
+  annotations:
+    openshift.io/node-selector: "region=east"
+...
+----
+
+. Run the migration plan again.