ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject incubator-ignite git commit: #IGNITE-497 Added configuration for EC2.
Date Wed, 25 Mar 2015 12:42:59 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-497 5ec1ca186 -> 40e65a397


#IGNITE-497 Added configuration for EC2.


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

Branch: refs/heads/ignite-497
Commit: 40e65a397580c91fb7328157ace22574b41c130d
Parents: 5ec1ca1
Author: nikolay_tikhonov <ntikhonov@gridgain.com>
Authored: Wed Mar 25 15:42:54 2015 +0300
Committer: nikolay_tikhonov <ntikhonov@gridgain.com>
Committed: Wed Mar 25 15:42:54 2015 +0300

----------------------------------------------------------------------
 .../yardstick/config/benchmark-ec2.properties   | 12 ++---
 modules/yardstick/config/ignite-ec2-config.xml  | 50 ++++++++++++++++++++
 modules/yardstick/config/ignite-es2-config.xml  | 50 --------------------
 3 files changed, 56 insertions(+), 56 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40e65a39/modules/yardstick/config/benchmark-ec2.properties
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/benchmark-ec2.properties b/modules/yardstick/config/benchmark-ec2.properties
index 239e554..748052e 100644
--- a/modules/yardstick/config/benchmark-ec2.properties
+++ b/modules/yardstick/config/benchmark-ec2.properties
@@ -60,10 +60,10 @@ nodesNum=$((`echo ${SERVER_HOSTS} | tr ',' '\n' | wc -l` + `echo ${DRIVER_HOSTS}
 # Run configuration which contains all benchmarks.
 # Note that each benchmark is set to run for 300 seconds (5 mins) with warm-up set to 60
seconds (1 minute).
 CONFIGS="\
--cfg ${SCRIPT_DIR}/../config/ignite-es2-config.xml -nn ${nodesNum} -b 1 -w 10 -d 20 -t 64
-sm PRIMARY_SYNC -dn IgnitePutBenchmark -cn atomic -sn IgniteNode -ds ${ver}atomic-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-es2-config.xml -nn ${nodesNum} -b 1 -w 10 -d 20 -t 64
-sm PRIMARY_SYNC -dn IgnitePutGetBenchmark -cn atomic -sn IgniteNode -ds ${ver}atomic-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-es2-config.xml -nn ${nodesNum} -b 1 -w 10 -d 20 -t 64
-sm PRIMARY_SYNC -dn IgnitePutTxBenchmark -cn tx -sn IgniteNode -ds ${ver}tx-put-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-es2-config.xml -nn ${nodesNum} -b 1 -w 10 -d 20 -t 64
-sm PRIMARY_SYNC -dn IgnitePutGetTxBenchmark -cn tx -sn IgniteNode -ds ${ver}tx-put-get-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-es2-config.xml -nn ${nodesNum} -b 1 -w 10 -d 20 -t 64
-sm PRIMARY_SYNC -dn IgniteSqlQueryBenchmark -cn query -sn IgniteNode -ds ${ver}sql-query-1-backup,\
--cfg ${SCRIPT_DIR}/../config/ignite-es2-config.xml -nn ${nodesNum} -b 1 -w 10 -d 20 -t 64
-sm PRIMARY_SYNC -dn IgniteSqlQueryPutBenchmark -cn query -sn IgniteNode -ds ${ver}sql-query-put-1-backup\
+-cfg ${SCRIPT_DIR}/../config/ignite-ec2-config.xml -nn ${nodesNum} -b 1 -w 10 -d 20 -t 64
-sm PRIMARY_SYNC -dn IgnitePutBenchmark -cn atomic -sn IgniteNode -ds ${ver}atomic-put-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-ec2-config.xml -nn ${nodesNum} -b 1 -w 10 -d 20 -t 64
-sm PRIMARY_SYNC -dn IgnitePutGetBenchmark -cn atomic -sn IgniteNode -ds ${ver}atomic-put-get-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-ec2-config.xml -nn ${nodesNum} -b 1 -w 10 -d 20 -t 64
-sm PRIMARY_SYNC -dn IgnitePutTxBenchmark -cn tx -sn IgniteNode -ds ${ver}tx-put-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-ec2-config.xml -nn ${nodesNum} -b 1 -w 10 -d 20 -t 64
-sm PRIMARY_SYNC -dn IgnitePutGetTxBenchmark -cn tx -sn IgniteNode -ds ${ver}tx-put-get-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-ec2-config.xml -nn ${nodesNum} -b 1 -w 10 -d 20 -t 64
-sm PRIMARY_SYNC -dn IgniteSqlQueryBenchmark -cn query -sn IgniteNode -ds ${ver}sql-query-1-backup,\
+-cfg ${SCRIPT_DIR}/../config/ignite-ec2-config.xml -nn ${nodesNum} -b 1 -w 10 -d 20 -t 64
-sm PRIMARY_SYNC -dn IgniteSqlQueryPutBenchmark -cn query -sn IgniteNode -ds ${ver}sql-query-put-1-backup\
 "

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40e65a39/modules/yardstick/config/ignite-ec2-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-ec2-config.xml b/modules/yardstick/config/ignite-ec2-config.xml
new file mode 100644
index 0000000..45dbd9d
--- /dev/null
+++ b/modules/yardstick/config/ignite-ec2-config.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+  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.
+-->
+
+<!--
+    Ignite Spring configuration file to startup grid.
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+    <import resource="ignite-base-config.xml"/>
+
+    <bean id="propertyPlaceholder" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
+    </bean>
+
+    <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" parent="base-ignite.cfg">
+        <property name="discoverySpi">
+            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
+                <property name="ipFinder">
+                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.s3.TcpDiscoveryS3IpFinder">
+                        <property name="bucketName" value="ignite-benchmark"/>
+                        <property name="awsCredentials">
+                            <bean class="com.amazonaws.auth.BasicAWSCredentials">
+                                <constructor-arg value="${amazon.access.key}"/>
+                                <constructor-arg value="${amazon.secret.key}"/>
+                            </bean>
+                        </property>
+                    </bean>
+                </property>
+            </bean>
+        </property>
+    </bean>
+</beans>

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/40e65a39/modules/yardstick/config/ignite-es2-config.xml
----------------------------------------------------------------------
diff --git a/modules/yardstick/config/ignite-es2-config.xml b/modules/yardstick/config/ignite-es2-config.xml
deleted file mode 100644
index 45dbd9d..0000000
--- a/modules/yardstick/config/ignite-es2-config.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  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.
--->
-
-<!--
-    Ignite Spring configuration file to startup grid.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-        http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-    <import resource="ignite-base-config.xml"/>
-
-    <bean id="propertyPlaceholder" class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
-        <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE"/>
-    </bean>
-
-    <bean id="grid.cfg" class="org.apache.ignite.configuration.IgniteConfiguration" parent="base-ignite.cfg">
-        <property name="discoverySpi">
-            <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi">
-                <property name="ipFinder">
-                    <bean class="org.apache.ignite.spi.discovery.tcp.ipfinder.s3.TcpDiscoveryS3IpFinder">
-                        <property name="bucketName" value="ignite-benchmark"/>
-                        <property name="awsCredentials">
-                            <bean class="com.amazonaws.auth.BasicAWSCredentials">
-                                <constructor-arg value="${amazon.access.key}"/>
-                                <constructor-arg value="${amazon.secret.key}"/>
-                            </bean>
-                        </property>
-                    </bean>
-                </property>
-            </bean>
-        </property>
-    </bean>
-</beans>


Mime
View raw message