Skip to content

Commit dbfc1bd

Browse files
calvinjiacalvinjia
committed
Use Tachyon 0.6.4 for cleaner dependencies.
1 parent e2ff80a commit dbfc1bd

File tree

3 files changed

+22
-109
lines changed

3 files changed

+22
-109
lines changed

‎core/pom.xml‎

Lines changed: 15 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -279,135 +279,47 @@
279279
<dependency>
280280
<groupId>org.tachyonproject</groupId>
281281
<artifactId>tachyon-client</artifactId>
282-
<version>0.6.3</version>
282+
<version>0.6.4</version>
283283
<exclusions>
284-
<exclusion>
285-
<groupId>commons-beanutils</groupId>
286-
<artifactId>commons-beanutils</artifactId>
287-
</exclusion>
288-
<exclusion>
289-
<groupId>commons-beanutils</groupId>
290-
<artifactId>commons-beanutils-core</artifactId>
291-
</exclusion>
292-
<exclusion>
293-
<groupId>commons-collections</groupId>
294-
<artifactId>commons-collections</artifactId>
295-
</exclusion>
296-
<exclusion>
297-
<groupId>commons-configuration</groupId>
298-
<artifactId>commons-configuration</artifactId>
299-
</exclusion>
300-
<exclusion>
301-
<groupId>commons-digester</groupId>
302-
<artifactId>commons-digester</artifactId>
303-
</exclusion>
304-
<exclusion>
305-
<groupId>commons-el</groupId>
306-
<artifactId>commons-el</artifactId>
307-
</exclusion>
308-
<exclusion>
309-
<groupId>commons-lang</groupId>
310-
<artifactId>commons-lang</artifactId>
311-
</exclusion>
312-
<exclusion>
313-
<groupId>commons-logging</groupId>
314-
<artifactId>commons-logging</artifactId>
315-
</exclusion>
316-
<exclusion>
317-
<groupId>hsqldb</groupId>
318-
<artifactId>hsqldb</artifactId>
319-
</exclusion>
320-
<exclusion>
321-
<groupId>jline</groupId>
322-
<artifactId>jline</artifactId>
323-
</exclusion>
324-
<exclusion>
325-
<groupId>org.apache.httpcomponents</groupId>
326-
<artifactId>httpclient</artifactId>
327-
</exclusion>
328-
<exclusion>
329-
<groupId>org.apache.httpcomponents</groupId>
330-
<artifactId>httpcore</artifactId>
331-
</exclusion>
332-
<exclusion>
333-
<groupId>org.apache.curator</groupId>
334-
<artifactId>curator-client</artifactId>
335-
</exclusion>
336-
<exclusion>
337-
<groupId>org.apache.curator</groupId>
338-
<artifactId>curator-framework</artifactId>
339-
</exclusion>
340-
<exclusion>
341-
<groupId>org.apache.curator</groupId>
342-
<artifactId>curator-recipes</artifactId>
343-
</exclusion>
344284
<exclusion>
345285
<groupId>org.apache.hadoop</groupId>
346286
<artifactId>hadoop-client</artifactId>
347287
</exclusion>
348288
<exclusion>
349-
<groupId>org.apache.zookeeper</groupId>
350-
<artifactId>zookeeper</artifactId>
351-
</exclusion>
352-
<exclusion>
353-
<groupId>org.apache.hadoop</groupId>
354-
<artifactId>hadoop-core</artifactId>
355-
</exclusion>
356-
<exclusion>
357-
<groupId>org.eclipse.jetty</groupId>
358-
<artifactId>jetty-continuation</artifactId>
359-
</exclusion>
360-
<exclusion>
361-
<groupId>org.eclipse.jetty</groupId>
362-
<artifactId>jetty-http</artifactId>
289+
<groupId>org.apache.curator</groupId>
290+
<artifactId>curator-recipes</artifactId>
363291
</exclusion>
364292
<exclusion>
365293
<groupId>org.eclipse.jetty</groupId>
366-
<artifactId>jetty-io</artifactId>
294+
<artifactId>jetty-jsp</artifactId>
367295
</exclusion>
368296
<exclusion>
369297
<groupId>org.eclipse.jetty</groupId>
370-
<artifactId>jetty-security</artifactId>
298+
<artifactId>jetty-webapp</artifactId>
371299
</exclusion>
372300
<exclusion>
373301
<groupId>org.eclipse.jetty</groupId>
374-
<artifactId>jetty-util</artifactId>
302+
<artifactId>jetty-server</artifactId>
375303
</exclusion>
376304
<exclusion>
377305
<groupId>org.eclipse.jetty</groupId>
378-
<artifactId>jetty-xml</artifactId>
306+
<artifactId>jetty-servlet</artifactId>
379307
</exclusion>
380308
<exclusion>
381-
<groupId>org.eclipse.jetty.orbit</groupId>
382-
<artifactId>javax.servlet</artifactId>
309+
<groupId>junit</groupId>
310+
<artifactId>junit</artifactId>
383311
</exclusion>
384312
<exclusion>
385-
<groupId>org.eclipse.jetty.orbit</groupId>
386-
<artifactId>javax.servlet.jsp</artifactId>
313+
<groupId>org.powermock</groupId>
314+
<artifactId>powermock-module-junit4</artifactId>
387315
</exclusion>
388316
<exclusion>
389-
<groupId>org.eclipse.jetty.orbit</groupId>
390-
<artifactId>org.apache.jasper.glassfish</artifactId>
317+
<groupId>org.powermock</groupId>
318+
<artifactId>powermock-api-mockito</artifactId>
391319
</exclusion>
392320
<exclusion>
393-
<groupId>org.eclipse.jetty.orbit</groupId>
394-
<artifactId>javax.servlet.jsp.jstl</artifactId>
395-
</exclusion>
396-
<exclusion>
397-
<groupId>org.eclipse.jetty.orbit</groupId>
398-
<artifactId>org.apache.taglibs.standard.glassfish</artifactId>
399-
</exclusion>
400-
<exclusion>
401-
<groupId>org.eclipse.jetty.orbit</groupId>
402-
<artifactId>javax.el</artifactId>
403-
</exclusion>
404-
<exclusion>
405-
<groupId>org.eclipse.jetty.orbit</groupId>
406-
<artifactId>com.sun.el</artifactId>
407-
</exclusion>
408-
<exclusion>
409-
<groupId>org.eclipse.jetty.orbit</groupId>
410-
<artifactId>org.eclipse.jdt.core</artifactId>
321+
<groupId>org.apache.curator</groupId>
322+
<artifactId>curator-test</artifactId>
411323
</exclusion>
412324
</exclusions>
413325
</dependency>

‎core/src/main/scala/org/apache/spark/storage/TachyonBlockManager.scala‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ private[spark] class TachyonBlockManager(
101101

102102
// TODO: Some of the logic here could be consolidated/de-duplicated with that in the DiskStore.
103103
private def createTachyonDirs(): Array[TachyonFile] = {
104-
logDebug(s"Creating tachyon directories at root dirs '$rootDirs'")
104+
logDebug("Creating tachyon directories at root dirs '" + rootDirs + "'")
105105
val dateFormat = new SimpleDateFormat("yyyyMMddHHmmss")
106106
rootDirs.split(",").map { rootDir =>
107107
var foundLocalDir = false
@@ -120,14 +120,15 @@ private[spark] class TachyonBlockManager(
120120
}
121121
} catch {
122122
case e: Exception =>
123-
logWarning(s"Attempt $tries to create tachyon dir $tachyonDir failed", e)
123+
logWarning("Attempt " + tries + " to create tachyon dir " + tachyonDir + " failed", e)
124124
}
125125
}
126126
if (!foundLocalDir) {
127-
logError(s"Failed $MAX_DIR_CREATION_ATTEMPTS attempts to create tachyon dir in $rootDir")
127+
logError("Failed " + MAX_DIR_CREATION_ATTEMPTS + " attempts to create tachyon dir in " +
128+
rootDir)
128129
System.exit(ExecutorExitCode.TACHYON_STORE_FAILED_TO_CREATE_DIR)
129130
}
130-
logInfo(s"Created tachyon directory at $tachyonDir")
131+
logInfo("Created tachyon directory at " + tachyonDir)
131132
tachyonDir
132133
}
133134
}
@@ -144,7 +145,7 @@ private[spark] class TachyonBlockManager(
144145
}
145146
} catch {
146147
case e: Exception =>
147-
logError(s"Exception while deleting tachyon spark dir: $tachyonDir", e)
148+
logError("Exception while deleting tachyon spark dir: " + tachyonDir, e)
148149
}
149150
}
150151
client.close()

‎make-distribution.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ SPARK_HOME="$(cd "`dirname "$0"`"; pwd)"
3232
DISTDIR="$SPARK_HOME/dist"
3333

3434
SPARK_TACHYON=false
35-
TACHYON_VERSION="0.6.3"
35+
TACHYON_VERSION="0.6.4"
3636
TACHYON_TGZ="tachyon-${TACHYON_VERSION}-bin.tar.gz"
3737
TACHYON_URL="https://github.com/amplab/tachyon/releases/download/v${TACHYON_VERSION}/${TACHYON_TGZ}"
3838

0 commit comments

Comments
 (0)