Merge pull request #155 from ghedsouza/master

Add details to Exception when data_xciever.connect() fails.

snakebite/client.py

@@ -15,17 +15,20 @@
 
 import snakebite.protobuf.ClientNamenodeProtocol_pb2 as client_proto
 import snakebite.glob as glob
-from snakebite.errors import RequestError
-from snakebite.service import RpcService
-from snakebite.errors import FileAlreadyExistsException
-from snakebite.errors import FileNotFoundException
-from snakebite.errors import DirectoryException
-from snakebite.errors import FileException
-from snakebite.errors import InvalidInputException
-from snakebite.errors import OutOfNNException
 from snakebite.channel import DataXceiverChannel
 from snakebite.config import HDFSConfig
+from snakebite.errors import (
+    ConnectionFailureException,
+    DirectoryException,
+    FileAlreadyExistsException,
+    FileException,
+    FileNotFoundException,
+    InvalidInputException,
+    OutOfNNException,
+    RequestError,
+    )
 from snakebite.namenode import Namenode
+from snakebite.service import RpcService
 
 import Queue
 import zlib
@@ -1140,7 +1143,10 @@ def _read_file(self, path, node, tail_only, check_crc, tail_length=1024):
                             failed_nodes.append(location.id.storageID)
                         successful_read = False
                 else:
-                    raise Exception
+                    raise ConnectionFailureException(
+                        u"Failure to connect to data node at ({}:{})".format(
+                            host, port
+                            ))
                 if successful_read:
                     break
             if successful_read is False:

snakebite/errors.py

@@ -14,29 +14,29 @@
 # the License.
 
 
-class FileNotFoundException(Exception):
+class ConnectionFailureException(Exception):
     def __init__(self, msg):
-        super(FileNotFoundException, self).__init__(msg)
+        super(ConnectionFailureException, self).__init__(msg)
 
 
-class FileAlreadyExistsException(Exception):
+class DirectoryException(Exception):
     def __init__(self, msg):
-        super(FileAlreadyExistsException, self).__init__(msg)
+        super(DirectoryException, self).__init__(msg)
 
 
-class RequestError(Exception):
+class FileAlreadyExistsException(Exception):
     def __init__(self, msg):
-        super(RequestError, self).__init__(msg)
+        super(FileAlreadyExistsException, self).__init__(msg)
 
 
-class DirectoryException(Exception):
+class FileException(Exception):
     def __init__(self, msg):
-        super(DirectoryException, self).__init__(msg)
+        super(FileException, self).__init__(msg)
 
 
-class FileException(Exception):
+class FileNotFoundException(Exception):
     def __init__(self, msg):
-        super(FileException, self).__init__(msg)
+        super(FileNotFoundException, self).__init__(msg)
 
 
 class InvalidInputException(Exception):
@@ -47,3 +47,8 @@ def __init__(self, msg):
 class OutOfNNException(Exception):
     def __init__(self, msg):
         super(OutOfNNException, self).__init__(msg)
+
+
+class RequestError(Exception):
+    def __init__(self, msg):
+        super(RequestError, self).__init__(msg)