From c5dd75eeb4de3fad9c6279721be11334371e2fb4 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Wed, 19 Aug 2009 10:54:43 -0700 Subject: [PATCH] Hadoop: Add package.html; fix a NULL instead of null error (Java) --- src/client/hadoop/ceph/CephFileSystem.java | 4 +- src/client/hadoop/ceph/package.html | 62 ++++++++++++++++++++++ 2 files changed, 64 insertions(+), 2 deletions(-) create mode 100644 src/client/hadoop/ceph/package.html diff --git a/src/client/hadoop/ceph/CephFileSystem.java b/src/client/hadoop/ceph/CephFileSystem.java index a2565d6d309c1..a411f20180527 100644 --- a/src/client/hadoop/ceph/CephFileSystem.java +++ b/src/client/hadoop/ceph/CephFileSystem.java @@ -33,7 +33,7 @@ import org.apache.hadoop.fs.FileStatus; *

* Configuration of the CephFileSystem is handled via a few Hadoop * Configuration properties:
- * fs.ceph.monAddr -- the ip address of the monitor to connect to.
+ * fs.ceph.monAddr -- the ip address/port of the monitor to connect to.
* fs.ceph.libDir -- the directory that libceph and libhadoopceph are * located in. This assumes Hadoop is being run on a linux-style machine * with names like libceph.so. @@ -128,7 +128,7 @@ public class CephFileSystem extends FileSystem { conf.setIfUnset("fs.ceph.debug", "false"); fs_default_name = conf.get("fs.default.name"); monAddr = conf.get("fs.ceph.monAddr"); - if (monAddr == NULL) throw new IOException("You must specify a Ceph monito address!"); + if (monAddr == null) throw new IOException("You must specify a Ceph monitor address!"); cephDebugLevel = conf.get("fs.ceph.debugLevel"); debug = ("true".equals(conf.get("fs.ceph.debug"))); // Initializes the client diff --git a/src/client/hadoop/ceph/package.html b/src/client/hadoop/ceph/package.html new file mode 100644 index 0000000000000..f6ceaaefc6c93 --- /dev/null +++ b/src/client/hadoop/ceph/package.html @@ -0,0 +1,62 @@ + + + + + + +

A client for the Ceph filesystem

+ +

Introduction

+ +This page describes how to use Ceph +as a backing store with Hadoop. This page assumes that you have downloaded +the Ceph software and installed necessary binaries as outlined in the Ceph +documentation. + +

Steps

+