Author: asavu
Date: Wed Feb 15 07:00:03 2012
New Revision: 1244378
URL: http://svn.apache.org/viewvc?rev=1244378&view=rev
Log:
WHIRR-35. Include .pac file for browsing to Hadoop clusters started on EC2
(asavu)
Added:
whirr/trunk/resources/
whirr/trunk/resources/apache/
whirr/trunk/resources/apache/cassandra/
whirr/trunk/resources/apache/cassandra/nodetool
whirr/trunk/resources/apache/cassandra/start
whirr/trunk/resources/apache/cassandra/stop
whirr/trunk/resources/apache/cassandra/wipe-state
whirr/trunk/resources/hadoop-ec2-proxy.pac
Removed:
whirr/trunk/scripts/apache/cassandra/nodetool
whirr/trunk/scripts/apache/cassandra/start
whirr/trunk/scripts/apache/cassandra/stop
whirr/trunk/scripts/apache/cassandra/wipe-state
Modified:
whirr/trunk/CHANGES.txt
whirr/trunk/src/site/xdoc/quick-start-guide.xml
Modified: whirr/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/whirr/trunk/CHANGES.txt?rev=1244378&r1=1244377&r2=1244378&view=diff
==============================================================================
--- whirr/trunk/CHANGES.txt (original)
+++ whirr/trunk/CHANGES.txt Wed Feb 15 07:00:03 2012
@@ -58,6 +58,9 @@ Trunk (unreleased changes)
WHIRR-463. Fail fast when running as root (asavu)
+ WHIRR-35. Include .pac file for browsing to Hadoop clusters
+ started on EC2 (asavu)
+
BUG FIXES
WHIRR-367. Wrong groupId for zookeeper (Joe Crobak via asavu)
Added: whirr/trunk/resources/apache/cassandra/nodetool
URL:
http://svn.apache.org/viewvc/whirr/trunk/resources/apache/cassandra/nodetool?rev=1244378&view=auto
==============================================================================
--- whirr/trunk/resources/apache/cassandra/nodetool (added)
+++ whirr/trunk/resources/apache/cassandra/nodetool Wed Feb 15 07:00:03 2012
@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -x
+set -e
+
+. /etc/profile
+
+nodetool -h localhost $1
+RESULT=$?
+sleep 2
+exit $RESULT
Added: whirr/trunk/resources/apache/cassandra/start
URL:
http://svn.apache.org/viewvc/whirr/trunk/resources/apache/cassandra/start?rev=1244378&view=auto
==============================================================================
--- whirr/trunk/resources/apache/cassandra/start (added)
+++ whirr/trunk/resources/apache/cassandra/start Wed Feb 15 07:00:03 2012
@@ -0,0 +1,26 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -x
+set -e
+
+. /etc/profile
+
+# launch using the script created by install
+nohup /etc/rc.local &
+sleep 2
Added: whirr/trunk/resources/apache/cassandra/stop
URL:
http://svn.apache.org/viewvc/whirr/trunk/resources/apache/cassandra/stop?rev=1244378&view=auto
==============================================================================
--- whirr/trunk/resources/apache/cassandra/stop (added)
+++ whirr/trunk/resources/apache/cassandra/stop Wed Feb 15 07:00:03 2012
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -x
+set -e
+
+. /etc/profile
+
+# assume we are the only java process FIXME: unsafe assumption
+killall java
+RESULT=$?
+sleep 2
+exit $RESULT
Added: whirr/trunk/resources/apache/cassandra/wipe-state
URL:
http://svn.apache.org/viewvc/whirr/trunk/resources/apache/cassandra/wipe-state?rev=1244378&view=auto
==============================================================================
--- whirr/trunk/resources/apache/cassandra/wipe-state (added)
+++ whirr/trunk/resources/apache/cassandra/wipe-state Wed Feb 15 07:00:03 2012
@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+set -x
+set -e
+
+. /etc/profile
+
+DD=/var/lib/cassandra
+rm -Rf $DD/data $DD/commitlog $DD/saved_caches
+RESULT=$?
+sleep 2
+exit $RESULT
Added: whirr/trunk/resources/hadoop-ec2-proxy.pac
URL:
http://svn.apache.org/viewvc/whirr/trunk/resources/hadoop-ec2-proxy.pac?rev=1244378&view=auto
==============================================================================
--- whirr/trunk/resources/hadoop-ec2-proxy.pac (added)
+++ whirr/trunk/resources/hadoop-ec2-proxy.pac Wed Feb 15 07:00:03 2012
@@ -0,0 +1,25 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+function FindProxyForURL(url, host) {
+ if ((shExpMatch(host, "*ec2*.amazonaws.com*")) ||
+ (shExpMatch(host, "*ec2.internal*")) ||
+ (shExpMatch(host, "*domu*.internal*"))) {
+ return "SOCKS localhost:6666";
+ }
+ return "DIRECT";
+}
Modified: whirr/trunk/src/site/xdoc/quick-start-guide.xml
URL:
http://svn.apache.org/viewvc/whirr/trunk/src/site/xdoc/quick-start-guide.xml?rev=1244378&r1=1244377&r2=1244378&view=diff
==============================================================================
--- whirr/trunk/src/site/xdoc/quick-start-guide.xml (original)
+++ whirr/trunk/src/site/xdoc/quick-start-guide.xml Wed Feb 15 07:00:03 2012
@@ -118,7 +118,7 @@ whirr.public-key-file=${sys:user.home}/.
worker nodes in the cluster. The most convenient way to do this is to use
a
<a class="externalLink"
href="http://en.wikipedia.org/wiki/Proxy_auto-config";>proxy auto-config
(PAC) file</a> file, such as
- <a class="externalLink"
href="http://apache-hadoop-ec2.s3.amazonaws.com/proxy.pac";>this
+ <a class="externalLink"
href="https://svn.apache.org/repos/asf/whirr/trunk/resources/hadoop-ec2-proxy.pac";>this
one</a> for Hadoop EC2 clusters.</p>
<p>If you are using Firefox, then you may find
<a class="externalLink" href="http://foxyproxy.mozdev.org/";>FoxyProxy</a>
useful for managing
