Skip to content

F
flink

doujutun3207 / flink
与 Fork 源项目一致

从无法访问的项目Fork

通知 24
Star 0
Fork 0
F
flink

体验新版 GitCode，发现更多精彩内容 >>

提交 a7493f7a 编写于 作者: R Robert Metzger
浏览文件
操作

Various minor fixes: 

- better exceptions for faulty temporary directories
- better exception if client can not connect to JobManager
上级 80ab5309
隐藏空白更改
内联 并排
Showing with 92 addition and 92 deletion
pom.xml
浏览文件 @ a7493f7a
......@@ -68,7 +68,7 @@
<scope>compile</scope>
</dependency>
<dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.16</version>
......@@ -234,64 +234,62 @@
</pluginManagement>
</build>
</profile>
<profile>
<id>jdk8</id>
<activation>
<activeByDefault>false</activeByDefault>
<jdk>1.8</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<quiet>true</quiet>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>jdk8</id>
<activation>
<activeByDefault>false</activeByDefault>
<jdk>1.8</jdk>
</activation>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.9.1</version>
<configuration>
<quiet>true</quiet>
</configuration>
<executions>
<execution>
<id>attach-javadocs</id>
<goals>
<goal>jar</goal>
</goals>
<configuration>
<additionalparam>-Xdoclint:none</additionalparam>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
<dependencyManagement>
<!-- this section defines the module versions that are used if nothing else is specified. -->
<dependencies>
<!-- Managed dependency required for HBase in pact-hbase -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.4.3</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.4.3</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.18.1-GA</version>
</dependency>
<!-- Managed dependency required for HBase in pact-hbase -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>1.4.3</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
<version>1.4.3</version>
</dependency>
<dependency>
<groupId>org.javassist</groupId>
<artifactId>javassist</artifactId>
<version>3.18.1-GA</version>
</dependency>
</dependencies>
</dependencyManagement>
<reporting>
<plugins>
<!-- execution of Unit Tests -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
......@@ -319,43 +317,43 @@
<build>
<plugins>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.10</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<numUnapprovedLicenses>0</numUnapprovedLicenses>
<excludes>
<!-- Additional files like .gitignore etc.-->
<exclude>**/.*</exclude>
<exclude>**/*.prefs</exclude>
<!-- Resource files which have values. -->
<exclude>**/resources/**</exclude>
<!-- Configuration Files. -->
<exclude>**/stratosphere-bin/conf/slaves</exclude>
<!-- Administrative files in the main trunk. -->
<exclude>README.md</exclude>
<exclude>CHANGELOG</exclude>
<exclude>**/*.creole</exclude>
<exclude>CONTRIBUTORS</exclude>
<!-- Build fiels -->
<exclude>**/pom.xml</exclude>
<exclude>**/pom.hadoop2.xml</exclude>
<exclude>**/*.iml</exclude>
<!-- Generated content -->
<exclude>**/target/**</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<version>0.10</version>
<executions>
<execution>
<phase>verify</phase>
<goals>
<goal>check</goal>
</goals>
</execution>
</executions>
<configuration>
<excludeSubProjects>false</excludeSubProjects>
<numUnapprovedLicenses>0</numUnapprovedLicenses>
<excludes>
<!-- Additional files like .gitignore etc.-->
<exclude>**/.*</exclude>
<exclude>**/*.prefs</exclude>
<!-- Resource files which have values. -->
<exclude>**/resources/**</exclude>
<!-- Configuration Files. -->
<exclude>**/stratosphere-bin/conf/slaves</exclude>
<!-- Administrative files in the main trunk. -->
<exclude>README.md</exclude>
<exclude>CHANGELOG</exclude>
<exclude>**/*.creole</exclude>
<exclude>CONTRIBUTORS</exclude>
<!-- Build fiels -->
<exclude>**/pom.xml</exclude>
<exclude>**/pom.hadoop2.xml</exclude>
<exclude>**/*.iml</exclude>
<!-- Generated content -->
<exclude>**/target/**</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<!-- just define the Java version to be used for compiling and plugins -->
<groupId>org.apache.maven.plugins</groupId>
......@@ -440,8 +438,8 @@
<configuration>
<rules>
<requireMavenVersion>
<version>(,2.1.0),(2.1.0,2.2.0),(2.2.0,)</version>
<message>Maven 2.1.0 and 2.2.0 produce incorrect GPG signatures and checksums respectively.</message>
<!-- enforce at least mvn version 3.0.3 -->
<version>[3.0.3,)</version>
</requireMavenVersion>
</rules>
</configuration>
......
stratosphere-compiler/src/main/java/eu/stratosphere/compiler/PactCompiler.java
浏览文件 @ a7493f7a
......@@ -1549,7 +1549,9 @@ public class PactCompiler {
throw new CompilerException(e.getMessage());
}
catch (Throwable t) {
throw new CompilerException("Error while connecting to the job manager: " + t.getMessage(), t);
throw new CompilerException("Cannot connect to the JobManager to determine the available TaskManagers. "
+ "Check if the JobManager is running (using the web interface or log files). Reason: " +
t.getMessage(), t);
}
// determine which type to run on
......
stratosphere-runtime/src/main/java/eu/stratosphere/nephele/taskmanager/TaskManager.java
浏览文件 @ a7493f7a
......@@ -934,15 +934,15 @@ public class TaskManager implements TaskOperationProtocol {
final File f = new File(dir);
if (!f.exists()) {
throw new Exception("Temporary file directory #" + (i + 1) + " does not exist.");
throw new Exception("Temporary file directory '" + f.getAbsolutePath() + "' does not exist.");
}
if (!f.isDirectory()) {
throw new Exception("Temporary file directory #" + (i + 1) + " is not a directory.");
throw new Exception("Temporary file directory '" + f.getAbsolutePath() + "' is not a directory.");
}
if (!f.canWrite()) {
throw new Exception("Temporary file directory #" + (i + 1) + " is not writable.");
throw new Exception("Temporary file directory '" + f.getAbsolutePath() + "' is not writable.");
}
}
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或