You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2017/02/20 13:28:30 UTC
[1/2] flink git commit: [FLINK-5749] [build] Unset HADOOP_HOME and
HADOOP_CONF_DIR variables for tests
Repository: flink
Updated Branches:
refs/heads/master f113d7945 -> 03e6c2491
[FLINK-5749] [build] Unset HADOOP_HOME and HADOOP_CONF_DIR variables for tests
This unsets the HADOOP_HOME and HADOOP_CONF_DIR envirobment variables for tests, to avoid
that the tests pick those variable up from build servers and produce unexpected test
results.
This closes #3288
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/48109378
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/48109378
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/48109378
Branch: refs/heads/master
Commit: 48109378bc337736c7469de0fe08ec12f7a8f76f
Parents: f113d79
Author: wenlong.lwl <we...@alibaba-inc.com>
Authored: Fri Jan 13 14:12:17 2017 +0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Mon Feb 20 12:55:28 2017 +0100
----------------------------------------------------------------------
.../flink-connector-filesystem/pom.xml | 6 ++++++
.../flink-hadoop-compatibility/pom.xml | 13 +++++++++++++
flink-fs-tests/pom.xml | 18 ++++++++++++++++++
flink-tests/pom.xml | 5 +++++
4 files changed, 42 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/48109378/flink-connectors/flink-connector-filesystem/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-filesystem/pom.xml b/flink-connectors/flink-connector-filesystem/pom.xml
index 6e0da2a..a37cb68 100644
--- a/flink-connectors/flink-connector-filesystem/pom.xml
+++ b/flink-connectors/flink-connector-filesystem/pom.xml
@@ -155,6 +155,12 @@ under the License.
-->
<forkCount>1</forkCount>
<reuseForks>false</reuseForks>
+
+ <environmentVariables>
+ <!-- Make sure external hadoop environment will not affect maven building -->
+ <HADOOP_HOME />
+ <HADOOP_CONF_DIR />
+ </environmentVariables>
</configuration>
</plugin>
</plugins>
http://git-wip-us.apache.org/repos/asf/flink/blob/48109378/flink-connectors/flink-hadoop-compatibility/pom.xml
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-hadoop-compatibility/pom.xml b/flink-connectors/flink-hadoop-compatibility/pom.xml
index fe25376..46e20ef 100644
--- a/flink-connectors/flink-hadoop-compatibility/pom.xml
+++ b/flink-connectors/flink-hadoop-compatibility/pom.xml
@@ -175,6 +175,19 @@ under the License.
<configLocation>${project.basedir}/../../tools/maven/scalastyle-config.xml</configLocation>
</configuration>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <environmentVariables>
+ <!-- Make sure external hadoop environment will not affect maven building -->
+ <HADOOP_HOME />
+ <HADOOP_CONF_DIR />
+ </environmentVariables>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flink/blob/48109378/flink-fs-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-fs-tests/pom.xml b/flink-fs-tests/pom.xml
index c5ee856..84bba0a 100644
--- a/flink-fs-tests/pom.xml
+++ b/flink-fs-tests/pom.xml
@@ -96,4 +96,22 @@ under the License.
<version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <environmentVariables>
+ <!-- Make sure external hadoop environment will not affect maven building -->
+ <HADOOP_HOME />
+ <HADOOP_CONF_DIR />
+ </environmentVariables>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+
</project>
http://git-wip-us.apache.org/repos/asf/flink/blob/48109378/flink-tests/pom.xml
----------------------------------------------------------------------
diff --git a/flink-tests/pom.xml b/flink-tests/pom.xml
index e9f0c66..e5e3e89 100644
--- a/flink-tests/pom.xml
+++ b/flink-tests/pom.xml
@@ -343,6 +343,11 @@ under the License.
<classpathDependencyExclude>org.apache.curator:curator-framework</classpathDependencyExclude>
</classpathDependencyExcludes>
<reuseForks>false</reuseForks>
+ <environmentVariables>
+ <!-- Make sure external hadoop environment will not affect maven building -->
+ <HADOOP_HOME />
+ <HADOOP_CONF_DIR />
+ </environmentVariables>
</configuration>
</plugin>
[2/2] flink git commit: [FLINK-5723] [web frontend] Use 'Used'
instead of 'Initial' in TaskManager memory consumption view
Posted by se...@apache.org.
[FLINK-5723] [web frontend] Use 'Used' instead of 'Initial' in TaskManager memory consumption view
This closes #3275
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/03e6c249
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/03e6c249
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/03e6c249
Branch: refs/heads/master
Commit: 03e6c249156fbbfeef39397a70c70bb905469d09
Parents: 4810937
Author: unknown <wa...@163.com>
Authored: Mon Feb 6 23:18:38 2017 +0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Mon Feb 20 12:57:47 2017 +0100
----------------------------------------------------------------------
.../app/partials/taskmanager/taskmanager.metrics.jade | 2 +-
.../web/partials/taskmanager/taskmanager.metrics.html | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/03e6c249/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade b/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
index b7e8fec..e348a5b 100644
--- a/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
+++ b/flink-runtime-web/web-dashboard/app/partials/taskmanager/taskmanager.metrics.jade
@@ -45,7 +45,7 @@ div(ng-if="metrics.id")
tr
th Type
th Committed
- th Initial
+ th Used
th Maximum
tbody
tr
http://git-wip-us.apache.org/repos/asf/flink/blob/03e6c249/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
----------------------------------------------------------------------
diff --git a/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html b/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
index 53aaa75..3372db8 100644
--- a/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
+++ b/flink-runtime-web/web-dashboard/web/partials/taskmanager/taskmanager.metrics.html
@@ -50,7 +50,7 @@ limitations under the License.
<tr>
<th>Type</th>
<th>Committed</th>
- <th>Initial</th>
+ <th>Used</th>
<th>Maximum</th>
</tr>
</thead>