Return-Path: 
 <commits-return-21769-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 3495FC8B7
	for <apmail-hbase-commits-archive@www.apache.org>;
 Mon, 22 Dec 2014 02:18:39 +0000 (UTC)
Received: (qmail 93499 invoked by uid 500); 22 Dec 2014 02:18:39 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 93456 invoked by uid 500); 22 Dec 2014 02:18:39 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 93447 invoked by uid 99); 22 Dec 2014 02:18:39 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 22 Dec 2014 02:18:39 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id C8DC99CC7E9; Mon, 22 Dec 2014 02:18:38 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: misty@apache.org
To: commits@hbase.apache.org
Message-Id: <021be91bda994eec94cc3235ffee5d66@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: hbase git commit: HBASE-12528 Document the newly introduced params
 for providing principal and keytabs. <Srikanth Srungarapu>
Date: Mon, 22 Dec 2014 02:18:38 +0000 (UTC)

Repository: hbase
Updated Branches:
  refs/heads/master 51334fb95 -> d9f25e30a


HBASE-12528 Document the newly introduced params for providing principal and keytabs. <Srikanth Srungarapu>


Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/d9f25e30
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d9f25e30
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d9f25e30

Branch: refs/heads/master
Commit: d9f25e30a1044caf9caaca047f954548c2ea8389
Parents: 51334fb
Author: Misty Stanley-Jones <mstanleyjones@cloudera.com>
Authored: Mon Dec 22 12:18:30 2014 +1000
Committer: Misty Stanley-Jones <mstanleyjones@cloudera.com>
Committed: Mon Dec 22 12:19:46 2014 +1000

----------------------------------------------------------------------
 src/main/docbkx/ops_mgt.xml | 48 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/d9f25e30/src/main/docbkx/ops_mgt.xml
----------------------------------------------------------------------
diff --git a/src/main/docbkx/ops_mgt.xml b/src/main/docbkx/ops_mgt.xml
index 3e38ff7..dedd238 100644
--- a/src/main/docbkx/ops_mgt.xml
+++ b/src/main/docbkx/ops_mgt.xml
@@ -215,6 +215,54 @@ private static final int ERROR_EXIT_CODE = 4;</programlisting>
         <screen language="bourne">$ ${HBASE_HOME}/bin/hbase orghapache.hadoop.hbase.tool.Canary -t 600000</screen>
       </section>
 
+      <section>
+        <title>Running Canary in a Kerberos-enabled Cluster</title>
+        <para>To run Canary in a Kerberos-enabled cluster, configure the following two properties in
+            <filename>hbase-site.xml</filename>:</para>
+        <itemizedlist>
+          <listitem>
+            <para><code>hbase.client.keytab.file</code></para>
+          </listitem>
+          <listitem>
+            <para><code>hbase.client.kerberos.principal</code></para>
+          </listitem>
+        </itemizedlist>
+        <para>Kerberos credentials are refreshed every 30 seconds when Canary runs in daemon
+          mode.</para>
+        <para>To configure the DNS interface for the client, configure the following optional
+          properties in <filename>hbase-site.xml</filename>.</para>
+        <itemizedlist>
+          <listitem>
+            <para><code>hbase.client.dns.interface</code></para>
+          </listitem>
+          <listitem>
+            <para><code>hbase.client.dns.nameserver</code></para>
+          </listitem>
+        </itemizedlist>
+        <example>
+          <title>Canary in a Kerberos-Enabled Cluster</title>
+          <para>This example shows each of the properties with valid values.</para>
+          <programlisting language="xml"><![CDATA[
+<property>
+  <name>hbase.client.kerberos.principal</name>
+  <value>hbase/_HOST@YOUR-REALM.COM</value>
+</property>
+<property>
+  <name>hbase.client.keytab.file</name>
+  <value>/etc/hbase/conf/keytab.krb5</value>
+</property>
+<!-- optional params -->
+property>
+  <name>hbase.client.dns.interface</name>
+  <value>default</value>
+</property>
+<property>
+  <name>hbase.client.dns.nameserver</name>
+  <value>default</value>
+</property>
+    ]]></programlisting>
+        </example>
+      </section>
     </section>
 
     <section