mirror of
https://github.com/OpenNebula/one.git
synced 2026-11-19 03:12:55 +09:00
#124: Added EC2_JVM_ARGS and custom number of concurrent EC2 operations
git-svn-id: http://svn.opennebula.org/one/trunk@797 3034c82b-c49b-4eb3-8279-a7acafdc01c0
This commit is contained in:
1 parent
28f3546fcf
commit
1cbd5fe024
2 files changed
+25
-2
No files matched your search
@@ -27,6 +27,8 @@ if !EC2_LOCATION
|
||||
exit(-1)
|
||||
end
|
||||
|
||||
EC2_JVM_CONCURRENCY = ENV["EC2_JVM_CONCURRENCY"]
|
||||
|
||||
ONE_LOCATION = ENV["ONE_LOCATION"]
|
||||
|
||||
if !ONE_LOCATION
|
||||
@@ -65,7 +67,14 @@ class EC2Driver < VirtualMachineDriver
|
||||
# EC2 constructor, loads defaults for the EC2Driver #
|
||||
# ------------------------------------------------------------------------ #
|
||||
def initialize(ec2_conf = nil)
|
||||
super(5,true)
|
||||
|
||||
if !EC2_JVM_CONCURRENCY
|
||||
concurrency = 5
|
||||
else
|
||||
concurrency = EC2_JVM_CONCURRENCY.to_i
|
||||
end
|
||||
|
||||
super(concurrency,true)
|
||||
|
||||
@defaults = Hash.new
|
||||
|
||||
|
||||
@@ -13,10 +13,24 @@
|
||||
# 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. #
|
||||
#--------------------------------------------------------------------------- ##
|
||||
#--------------------------------------------------------------------------- #
|
||||
|
||||
#May be needed in some setups
|
||||
#CLASSPATH=""
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
# EC2 API TOOLS Configuration.
|
||||
#----------------------------------------------------------------------------
|
||||
#EC2_HOME="<path_to_ec2_utils>"
|
||||
#EC2_PRIVATE_KEY="<path_to_your_ec2_pem_key>"
|
||||
#EC2_CERT="<path_to_your_ec2_pem_cert>"
|
||||
|
||||
#
|
||||
#----------------------------------------------------------------------------
|
||||
# Driver configuration
|
||||
#----------------------------------------------------------------------------
|
||||
# Arguments for the JAVA Virtual Machine
|
||||
EC2_JVM_ARGS="-Xms16m -Xmx64m"
|
||||
|
||||
# Number of concurrent EC2 operations (not instances)
|
||||
EC2_JVM_CONCURRENCY=10
|
||||
Reference in new issue
Block a user