iota-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tonyfaust...@apache.org
Subject [4/4] incubator-iota git commit: Merging PR #9 and #10
Date Fri, 08 Jul 2016 01:06:41 GMT
Merging PR #9 and #10


Project: http://git-wip-us.apache.org/repos/asf/incubator-iota/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-iota/commit/c381fc42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-iota/tree/c381fc42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-iota/diff/c381fc42

Branch: refs/heads/master
Commit: c381fc428f7b7e9f192b7664351edfe6b1fd5157
Parents: 40f6adb 7461c92
Author: Tony Faustini <tonyfaustini@apache.org>
Authored: Thu Jul 7 18:06:30 2016 -0700
Committer: Tony Faustini <tonyfaustini@apache.org>
Committed: Thu Jul 7 18:06:30 2016 -0700

----------------------------------------------------------------------
 fey-core/README.md                                        |  2 +-
 fey-core/src/main/resources/application.conf              |  8 +++++++-
 .../src/main/scala/org/apache/iota/fey/Ensemble.scala     |  7 +++++--
 fey-core/src/main/scala/org/apache/iota/fey/FeyCore.scala |  3 +++
 .../main/scala/org/apache/iota/fey/FeyGenericActor.scala  |  5 +++++
 .../scala/org/apache/iota/fey/IdentifyFeyActors.scala     | 10 ++++++++++
 .../main/scala/org/apache/iota/fey/Orchestration.scala    |  3 +++
 fey-core/src/main/scala/org/apache/iota/fey/Utils.scala   |  4 +++-
 8 files changed, 37 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/c381fc42/fey-core/README.md
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/c381fc42/fey-core/src/main/resources/application.conf
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/c381fc42/fey-core/src/main/scala/org/apache/iota/fey/Ensemble.scala
----------------------------------------------------------------------
diff --cc fey-core/src/main/scala/org/apache/iota/fey/Ensemble.scala
index 73d1b59,b4553aa..1a18bb9
--- a/fey-core/src/main/scala/org/apache/iota/fey/Ensemble.scala
+++ b/fey-core/src/main/scala/org/apache/iota/fey/Ensemble.scala
@@@ -158,17 -160,22 +160,18 @@@ protected class Ensemble(val orchestrat
            createFeyActor(connID, connectors.getOrElse(connID,Array.empty),tmpActors)
          }).toMap
  
 -        val clazz = loadClazzFromJar(performerInfo.classPath, performerInfo.jarName)
  
          var actor:ActorRef = null
 +        val actorProps = getPerformer(performerInfo, connections)
          if(performerInfo.autoScale > 0) {
-           val resizer = DefaultResizer(lowerBound = 1, upperBound = performerInfo.autoScale,
messagesPerResize = 200, backoffThreshold = 0.4)
+           val resizer = DefaultResizer(lowerBound = 1, upperBound = performerInfo.autoScale,
+             messagesPerResize = CONFIG.MESSAGES_PER_RESIZE, backoffThreshold = 0.4)
            val smallestMailBox = SmallestMailboxPool(1, Some(resizer))
  
 -          actor = context.actorOf(
 -            smallestMailBox.props(Props(clazz,
 -              performerInfo.parameters, performerInfo.backoff, connections, performerInfo.schedule,
orchestrationName, orchestrationID, true)),
 -            name = performerID)
 +          actor = context.actorOf(smallestMailBox.props(actorProps), name = performerID)
 +
          }else{
 -          actor = context.actorOf(Props(clazz, performerInfo.parameters,
 -            performerInfo.backoff, connections, performerInfo.schedule, orchestrationName,
orchestrationID, false),
 -            name = performerID)
 +          actor = context.actorOf(actorProps, name = performerID)
          }
  
          context.watch(actor)

http://git-wip-us.apache.org/repos/asf/incubator-iota/blob/c381fc42/fey-core/src/main/scala/org/apache/iota/fey/Utils.scala
----------------------------------------------------------------------


Mime
View raw message