From 0102f3d3898dd0ea9ecae2cfcc0757f1a510fa6c Mon Sep 17 00:00:00 2001 From: Sean Owen Date: Thu, 24 Apr 2014 09:41:16 +0100 Subject: [PATCH 1/2] Replace octal literals, removed in Scala 2.11, with hex literals --- .../main/scala/org/apache/spark/deploy/yarn/ClientBase.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala index b403292d9cb2e..638fa16b312fb 100644 --- a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala +++ b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala @@ -59,9 +59,9 @@ trait ClientBase extends Logging { private val distCacheMgr = new ClientDistributedCacheManager() // Staging directory is private! -> rwx-------- - val STAGING_DIR_PERMISSION: FsPermission = FsPermission.createImmutable(0700: Short) + val STAGING_DIR_PERMISSION: FsPermission = FsPermission.createImmutable(0x1C0: Short) // 0700 // App files are world-wide readable and owner writable -> rw-r--r-- - val APP_FILE_PERMISSION: FsPermission = FsPermission.createImmutable(0644: Short) + val APP_FILE_PERMISSION: FsPermission = FsPermission.createImmutable(0x1A4: Short) // 0644 // TODO(harvey): This could just go in ClientArguments. def validateArgs() = { From 1ee0e67e81084f1b50b47f3547f988c7fb760bd8 Mon Sep 17 00:00:00 2001 From: Sean Owen Date: Fri, 25 Apr 2014 06:41:13 +0100 Subject: [PATCH 2/2] Use Integer.parseInt(...,8) for octal literal instead of hex equivalent --- .../scala/org/apache/spark/deploy/yarn/ClientBase.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala index 638fa16b312fb..eb95d784318ea 100644 --- a/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala +++ b/yarn/common/src/main/scala/org/apache/spark/deploy/yarn/ClientBase.scala @@ -59,9 +59,11 @@ trait ClientBase extends Logging { private val distCacheMgr = new ClientDistributedCacheManager() // Staging directory is private! -> rwx-------- - val STAGING_DIR_PERMISSION: FsPermission = FsPermission.createImmutable(0x1C0: Short) // 0700 + val STAGING_DIR_PERMISSION: FsPermission = + FsPermission.createImmutable(Integer.parseInt("700", 8): Short) // App files are world-wide readable and owner writable -> rw-r--r-- - val APP_FILE_PERMISSION: FsPermission = FsPermission.createImmutable(0x1A4: Short) // 0644 + val APP_FILE_PERMISSION: FsPermission = + FsPermission.createImmutable(Integer.parseInt("644", 8): Short) // TODO(harvey): This could just go in ClientArguments. def validateArgs() = {