Mailing-List: contact reviews-help@spark.apache.org; run by ezmlm
Precedence: bulk
From: andrewor14 <git@git.apache.org>
To: reviews@spark.apache.org
Reply-To: reviews@spark.apache.org
References: <git-pr-4960-spark@git.apache.org>
In-Reply-To: <git-pr-4960-spark@git.apache.org>
Subject: [GitHub] spark pull request: [SPARK-6284][MESOS] Add mesos role,
 principal ...
Content-Type: text/plain
Message-Id: <20150325005146.A7C00E10B2@git1-us-west.apache.org>
Date: Wed, 25 Mar 2015 00:51:46 +0000 (UTC)

Github user andrewor14 commented on a diff in the pull request:

    https://github.com/apache/spark/pull/4960#discussion_r27087566
  
    --- Diff: core/src/main/scala/org/apache/spark/scheduler/cluster/mesos/MesosSchedulerUtils.scala ---
    @@ -0,0 +1,116 @@
    +/*
    + * Licensed to the Apache Software Foundation (ASF) under one or more
    + * contributor license agreements.  See the NOTICE file distributed with
    + * this work for additional information regarding copyright ownership.
    + * The ASF licenses this file to You 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.
    + */
    +
    +package org.apache.spark.scheduler.cluster.mesos
    +
    +import java.util.List
    +
    +import scala.collection.JavaConversions._
    +import scala.collection.mutable.ArrayBuffer
    +
    +import org.apache.mesos.Protos._
    +import org.apache.mesos.{Scheduler, MesosSchedulerDriver}
    +import org.apache.spark.{Logging, SparkConf}
    +import org.apache.mesos.protobuf.ByteString
    +import org.apache.mesos.Protos.Value.Type
    +
    +
    +private[spark] trait MesosSchedulerUtils extends Logging {
    +  def createSchedulerDriver(
    +      scheduler: Scheduler,
    +      sparkUser: String,
    +      appName: String,
    +      masterUrl: String,
    +      conf: SparkConf) = {
    +    val fwInfoBuilder = FrameworkInfo.newBuilder().setUser(sparkUser).setName(appName)
    +    var credBuilder: Option[Credential.Builder] = None
    +
    +    conf.getOption("spark.mesos.principal").foreach { principal =>
    +      fwInfoBuilder.setPrincipal(principal)
    +      credBuilder = Option(Credential.newBuilder().setPrincipal(principal))
    +    }
    +
    +    conf.getOption("spark.mesos.secret").foreach { secret =>
    +      credBuilder = Option(credBuilder.getOrElse(Credential.newBuilder())
    +        .setSecret(ByteString.copyFromUtf8(secret)))
    +    }
    +
    +    conf.getOption("spark.mesos.role").foreach { role =>
    +      fwInfoBuilder.setRole(role)
    +    }
    +
    +    if (credBuilder.isDefined) {
    +      new MesosSchedulerDriver(
    +        scheduler, fwInfoBuilder.build, masterUrl, credBuilder.get.build())
    +    } else {
    +      new MesosSchedulerDriver(scheduler, fwInfoBuilder.build, masterUrl)
    +    }
    +  }
    +
    +  // Helper function to pull out a resource from a Mesos Resources protobuf
    +  def getResource(res: List[Resource], name: String): Double = {
    +    var resource = 0.0
    +    // A resource can have multiple values in the offer since it can either be from
    +    // a specific role or wildcard.
    +    for (r <- res if r.getName == name) {
    +      resource += r.getScalar.getValue
    +
    +    }
    +    resource
    +  }
    +
    +  /**
    +   * Partition the existing resource list based on the resources requested and
    +   * the remaining resources.
    +   * @return The remaining resources list and the used resources list.
    +   */
    +  def partitionResources(
    +      resources: List[Resource],
    +      resourceName: String,
    +      count: Double): (List[Resource], List[Resource]) = {
    +    var remain = count
    +    var usedResources = new ArrayBuffer[Resource]
    +    val newResources = resources.collect {
    +      case r => {
    +        if (remain > 0 &&
    +          r.getType == Type.SCALAR &&
    +          r.getScalar.getValue > 0.0 &&
    +          r.getName == resourceName) {
    +          val usage = Math.min(remain, r.getScalar.getValue)
    +          usedResources += Resource.newBuilder()
    +            .setName(resourceName)
    +            .setRole(r.getRole)
    +            .setType(Value.Type.SCALAR)
    +            .setScalar(Value.Scalar.newBuilder().setValue(usage).build())
    +            .build()
    +          remain -= usage
    +          Resource.newBuilder()
    +            .setName(resourceName)
    +            .setRole(r.getRole)
    +            .setType(Value.Type.SCALAR)
    +            .setScalar(Value.Scalar.newBuilder().setValue(r.getScalar.getValue - usage).build())
    +            .build()
    +        } else {
    +          r
    +        }
    +      }
    +    }
    +
    +    (newResources.filter(r => r.getType != Type.SCALAR || r.getScalar.getValue > 0.0).toList,
    +      usedResources.toList)
    --- End diff --
    
    for readability, would you mind putting
    ```
    val remainingResources = newResources.toList.filter { r =>
      ...
    }
    (remainingResources, usedResources.toList)
    ```


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---

---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org