Index: oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
===================================================================
--- oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java	(revision 1591822)
+++ oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java	(working copy)
@@ -162,6 +162,11 @@
         logNewNode(this);
     }
 
+    @Override
+    public String toString() {
+        return getPath();
+    }
+
     //---------------------------------------------------------< NodeState >--
 
     @Override
Index: oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
===================================================================
--- oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java	(revision 1591822)
+++ oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java	(working copy)
@@ -78,6 +78,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
+import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -156,6 +157,8 @@
     private static final Logger logger =
         LoggerFactory.getLogger(RepositoryUpgrade.class);
 
+    private static final Charset UTF_8 = Charset.forName("UTF-8");
+
     /**
      * Source repository context.
      */
@@ -779,6 +782,12 @@
      * This is a temporary approach for OAK-1760 for 1.0 branch.
      */
     private void setChildNode(NodeBuilder parent, String name, NodeState state) {
+        // OAK-1589: maximum supported length of name for DocumentNodeStore
+        // is 150 bytes. Skip the sub tree if the the name is too long
+        if (name.length() > 37 && name.getBytes(UTF_8).length > 150) {
+            logger.warn("Node name too long. Skipping {}", state);
+            return;
+        }
         NodeBuilder builder = parent.setChildNode(name);
         for (PropertyState property : state.getProperties()) {
             builder.setProperty(property);