You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by go...@apache.org on 2015/03/16 21:36:09 UTC
[1/2] incubator-slider git commit: SLIDER-319 -block out ganglia
integration
Repository: incubator-slider
Updated Branches:
refs/heads/releases/slider-0.70.1-incubating a8919c847 -> 5ab6b112b
SLIDER-319 -block out ganglia integration
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/6106f791
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/6106f791
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/6106f791
Branch: refs/heads/releases/slider-0.70.1-incubating
Commit: 6106f791a3981062ba12bcaacbaf846dd927069b
Parents: a8919c8
Author: Steve Loughran <st...@apache.org>
Authored: Thu Mar 12 15:54:53 2015 -0700
Committer: Gour Saha <go...@apache.org>
Committed: Mon Mar 16 13:33:06 2015 -0700
----------------------------------------------------------------------
slider-core/pom.xml | 2 ++
.../management/MetricsBindingService.java | 18 ++++++++++--------
2 files changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6106f791/slider-core/pom.xml
----------------------------------------------------------------------
diff --git a/slider-core/pom.xml b/slider-core/pom.xml
index 38406ab..62b91f1 100644
--- a/slider-core/pom.xml
+++ b/slider-core/pom.xml
@@ -343,10 +343,12 @@
<artifactId>metrics-core</artifactId>
</dependency>
+<!--
<dependency>
<groupId>com.codahale.metrics</groupId>
<artifactId>metrics-ganglia</artifactId>
</dependency>
+-->
<dependency>
<groupId>com.codahale.metrics</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/6106f791/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsBindingService.java
----------------------------------------------------------------------
diff --git a/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsBindingService.java b/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsBindingService.java
index fb1dbd2..f8646bf 100644
--- a/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsBindingService.java
+++ b/slider-core/src/main/java/org/apache/slider/server/appmaster/management/MetricsBindingService.java
@@ -22,9 +22,7 @@ import com.codahale.metrics.JmxReporter;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.ScheduledReporter;
import com.codahale.metrics.Slf4jReporter;
-import com.codahale.metrics.ganglia.GangliaReporter;
import com.google.common.base.Preconditions;
-import info.ganglia.gmetric4j.gmetric.GMetric;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.service.CompositeService;
import org.apache.slider.server.services.workflow.ClosingService;
@@ -86,23 +84,26 @@ public class MetricsBindingService extends CompositeService
// Ganglia
if (conf.getBoolean(METRICS_GANGLIA_ENABLED, false)) {
- GangliaReporter gangliaReporter;
+ log.warn("Ganglia integration is not implemented");
+/*
+ // This is all disabled due to transitive dependencies on an LGPL library
+ com.codahale.metrics.ganglia.GangliaReporter gangliaReporter;
String host = conf.getTrimmed(METRICS_GANGLIA_HOST, "");
int port = conf.getInt(METRICS_GANGLIA_PORT, DEFAULT_GANGLIA_PORT);
int interval = conf.getInt(METRICS_GANGLIA_REPORT_INTERVAL, 60);
int ttl = 1;
- GMetric.UDPAddressingMode
- mcast = GMetric.UDPAddressingMode.getModeForAddress(host);
+ info.ganglia.gmetric4j.gmetric.GMetric.UDPAddressingMode
+ mcast = info.ganglia.gmetric4j.gmetric.GMetric.UDPAddressingMode.getModeForAddress(host);
boolean ganglia31 = conf.getBoolean(METRICS_GANGLIA_VERSION_31, true);
- final GMetric ganglia =
- new GMetric(
+ final info.ganglia.gmetric4j.gmetric.GMetric ganglia =
+ new info.ganglia.gmetric4j.gmetric.GMetric(
host,
port,
mcast,
ttl,
ganglia31);
- gangliaReporter = GangliaReporter.forRegistry(metrics)
+ gangliaReporter = com.codahale.metrics.ganglia.GangliaReporter.forRegistry(metrics)
.convertRatesTo(TimeUnit.SECONDS)
.convertDurationsTo(
TimeUnit.MILLISECONDS)
@@ -111,6 +112,7 @@ public class MetricsBindingService extends CompositeService
addService(new ClosingService<ScheduledReporter>(gangliaReporter));
summary.append(String.format(", Ganglia at %s:%d interval=%d",
host, port, interval));
+ */
}
// Logging
[2/2] incubator-slider git commit: SLIDER-815 Binary files (dlls and
exes) in git source and Slider source release (both .zip and .tar.gz)
Posted by go...@apache.org.
SLIDER-815 Binary files (dlls and exes) in git source and Slider source release (both .zip and .tar.gz)
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/5ab6b112
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/5ab6b112
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/5ab6b112
Branch: refs/heads/releases/slider-0.70.1-incubating
Commit: 5ab6b112bd6e24897df379ee0db3c144c79e5380
Parents: 6106f79
Author: Gour Saha <go...@apache.org>
Authored: Mon Mar 16 11:02:56 2015 -0700
Committer: Gour Saha <go...@apache.org>
Committed: Mon Mar 16 13:34:15 2015 -0700
----------------------------------------------------------------------
.../hadoop-2.6.0-SNAPSHOT/bin/hadoop.dll | Bin 92672 -> 0 bytes
bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hdfs.dll | Bin 57344 -> 0 bytes
.../hadoop-2.6.0-SNAPSHOT/bin/winutils.exe | Bin 108032 -> 0 bytes
bin/windows/hadoop-2.6.0-SNAPSHOT/readme.md | 22 -------------------
bin/windows/hadoop-2.6.0/bin/hadoop.dll | Bin 92672 -> 0 bytes
bin/windows/hadoop-2.6.0/bin/hadoop.pdb | Bin 502784 -> 0 bytes
bin/windows/hadoop-2.6.0/bin/hdfs.dll | Bin 57344 -> 0 bytes
bin/windows/hadoop-2.6.0/bin/hdfs.pdb | Bin 347136 -> 0 bytes
bin/windows/hadoop-2.6.0/bin/winutils.exe | Bin 108032 -> 0 bytes
bin/windows/hadoop-2.6.0/bin/winutils.pdb | Bin 896000 -> 0 bytes
10 files changed, 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5ab6b112/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hadoop.dll
----------------------------------------------------------------------
diff --git a/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hadoop.dll b/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hadoop.dll
deleted file mode 100644
index 8da86d2..0000000
Binary files a/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hadoop.dll and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5ab6b112/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hdfs.dll
----------------------------------------------------------------------
diff --git a/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hdfs.dll b/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hdfs.dll
deleted file mode 100644
index d96248c..0000000
Binary files a/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/hdfs.dll and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5ab6b112/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/winutils.exe
----------------------------------------------------------------------
diff --git a/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/winutils.exe b/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/winutils.exe
deleted file mode 100644
index a4edc85..0000000
Binary files a/bin/windows/hadoop-2.6.0-SNAPSHOT/bin/winutils.exe and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5ab6b112/bin/windows/hadoop-2.6.0-SNAPSHOT/readme.md
----------------------------------------------------------------------
diff --git a/bin/windows/hadoop-2.6.0-SNAPSHOT/readme.md b/bin/windows/hadoop-2.6.0-SNAPSHOT/readme.md
deleted file mode 100644
index 9e4dd52..0000000
--- a/bin/windows/hadoop-2.6.0-SNAPSHOT/readme.md
+++ /dev/null
@@ -1,22 +0,0 @@
-<!---
- Licensed 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. See accompanying LICENSE file.
--->
-
-# Windows Binaries
-
-This directory contains the native libraries needed for running Hadoop on
-windows. It's here so that jenkins builds on windows do not
-need to rely on a pre-installed version of hadoop.
-
-To ise
-
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5ab6b112/bin/windows/hadoop-2.6.0/bin/hadoop.dll
----------------------------------------------------------------------
diff --git a/bin/windows/hadoop-2.6.0/bin/hadoop.dll b/bin/windows/hadoop-2.6.0/bin/hadoop.dll
deleted file mode 100644
index 78ad8a8..0000000
Binary files a/bin/windows/hadoop-2.6.0/bin/hadoop.dll and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5ab6b112/bin/windows/hadoop-2.6.0/bin/hadoop.pdb
----------------------------------------------------------------------
diff --git a/bin/windows/hadoop-2.6.0/bin/hadoop.pdb b/bin/windows/hadoop-2.6.0/bin/hadoop.pdb
deleted file mode 100644
index 3701ec8..0000000
Binary files a/bin/windows/hadoop-2.6.0/bin/hadoop.pdb and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5ab6b112/bin/windows/hadoop-2.6.0/bin/hdfs.dll
----------------------------------------------------------------------
diff --git a/bin/windows/hadoop-2.6.0/bin/hdfs.dll b/bin/windows/hadoop-2.6.0/bin/hdfs.dll
deleted file mode 100644
index 9ce72c8..0000000
Binary files a/bin/windows/hadoop-2.6.0/bin/hdfs.dll and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5ab6b112/bin/windows/hadoop-2.6.0/bin/hdfs.pdb
----------------------------------------------------------------------
diff --git a/bin/windows/hadoop-2.6.0/bin/hdfs.pdb b/bin/windows/hadoop-2.6.0/bin/hdfs.pdb
deleted file mode 100644
index 8d4c06c..0000000
Binary files a/bin/windows/hadoop-2.6.0/bin/hdfs.pdb and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5ab6b112/bin/windows/hadoop-2.6.0/bin/winutils.exe
----------------------------------------------------------------------
diff --git a/bin/windows/hadoop-2.6.0/bin/winutils.exe b/bin/windows/hadoop-2.6.0/bin/winutils.exe
deleted file mode 100644
index 6fbbd20..0000000
Binary files a/bin/windows/hadoop-2.6.0/bin/winutils.exe and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/5ab6b112/bin/windows/hadoop-2.6.0/bin/winutils.pdb
----------------------------------------------------------------------
diff --git a/bin/windows/hadoop-2.6.0/bin/winutils.pdb b/bin/windows/hadoop-2.6.0/bin/winutils.pdb
deleted file mode 100644
index bab211f..0000000
Binary files a/bin/windows/hadoop-2.6.0/bin/winutils.pdb and /dev/null differ