Skip to content

Commit 77bcad4

Browse files
lvcalvca
committed
Distributed: updated default configuration
1 parent 3219000 commit 77bcad4

8 files changed

Lines changed: 151 additions & 32 deletions

File tree

‎distributed/config/orientdb-dserver-config.xml‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,20 @@
2424
<parameter name="db.exclude" value="" /><!-- USE COMMA TO SEPARATE MULTIPLE DATABASE NAMES -->
2525
</parameters>
2626
</handler>
27+
<!-- MAIL, TO TURN ON SET THE 'ENABLED' PARAMETER TO 'true' -->
28+
<handler class="com.orientechnologies.orient.server.plugin.mail.OMailPlugin">
29+
<parameters>
30+
<parameter name="enabled" value="true" />
31+
<!-- CREATE MULTIPLE PROFILES WITH profile.<name>... -->
32+
<parameter name="profile.default.mail.smtp.host" value="localhost" />
33+
<parameter name="profile.default.mail.smtp.port" value="25" />
34+
<parameter name="profile.default.mail.smtp.auth" value="true" />
35+
<parameter name="profile.default.mail.smtp.starttls.enable" value="true" />
36+
<parameter name="profile.default.mail.smtp.user" value="" />
37+
<parameter name="profile.default.mail.smtp.password" value="" />
38+
<parameter name="profile.default.mail.date.format" value="yyyy-MM-dd HH:mm:ss" />
39+
</parameters>
40+
</handler>
2741
<!-- SERVER SIDE SCRIPT INTERPRETER. WARNING! THIS CAN BE A SECURITY HOLE: ENABLE IT ONLY IF CLIENTS ARE TRUCT, TO TURN ON SET THE 'ENABLED' PARAMETER
2842
TO 'true' -->
2943
<handler class="com.orientechnologies.orient.server.handler.OServerSideScriptInterpreter">
@@ -75,7 +89,21 @@
7589
<!-- Uses the Hazelcast's distributed cache as 2nd level cache -->
7690
<!-- <entry name="cache.level2.impl" value="com.orientechnologies.orient.server.hazelcast.OHazelcastCache" /> -->
7791

78-
<!-- Enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
92+
<!-- DATABASE POOL: size min/max -->
93+
<entry name="db.pool.min" value="1" />
94+
<entry name="db.pool.max" value="20" />
95+
96+
<!-- LEVEL1 AND 2 CACHE: enable/disable and set the size as number of entries -->
97+
<entry name="cache.level1.enabled" value="false" />
98+
<entry name="cache.level1.size" value="1000" />
99+
<entry name="cache.level2.enabled" value="true" />
100+
<entry name="cache.level2.size" value="1000" />
101+
102+
<!-- PROFILER: configures the profiler as <seconds-for-snapshot>,<archive-snapshot-size>,<summary-size> -->
103+
<entry name="profiler.enabled" value="true" />
104+
<!-- <entry name="profiler.config" value="30,10,10" /> -->
105+
106+
<!-- LOG: enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
79107
<entry name="log.console.level" value="info" />
80108
<entry name="log.file.level" value="fine" />
81109
</properties>

‎distributed/src/test/resources/hazelcast-1.xml‎

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- ~ Copyright (c) 2008-2012, Hazel Bilisim Ltd. All Rights Reserved. ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not
3-
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
4-
required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR
5-
CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. -->
2+
<!-- ~ Copyright (c) 2008-2012, Hazel Bilisim Ltd. All Rights Reserved. ~
3+
~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may
4+
not use this file except in compliance with the License. ~ You may obtain
5+
a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~
6+
~ Unless required by applicable law or agreed to in writing, software ~ distributed
7+
under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES
8+
OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for
9+
the specific language governing permissions and ~ limitations under the License. -->
610

7-
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-2.1.xsd" xmlns="http://www.hazelcast.com/schema/config"
8-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
11+
<hazelcast
12+
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-2.1.xsd"
13+
xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
914
<group>
1015
<name>orientdb</name>
1116
<password>orientdb</password>
@@ -14,7 +19,7 @@
1419
<port auto-increment="false">2434</port>
1520
<join>
1621
<multicast enabled="true">
17-
<multicast-group>235.1.1.1</multicast-group>
22+
<multicast-group>224.2.2.3</multicast-group>
1823
<multicast-port>2434</multicast-port>
1924
</multicast>
2025
</join>
@@ -24,5 +29,13 @@
2429
<max-pool-size>16</max-pool-size>
2530
<keep-alive-seconds>60</keep-alive-seconds>
2631
</executor-service>
32+
<!-- Add your own semaphore configurations here: <semaphore name="default">
33+
<initial-permits>10</initial-permits> <semaphore-factory enabled="true">
34+
<class-name>com.acme.MySemaphoreFactory</class-name> </semaphore-factory>
35+
</semaphore> -->
36+
37+
<!-- Add your own map merge policy implementations here: <merge-policies>
38+
<map-merge-policy name="MY_MERGE_POLICY"> <class-name>com.acme.MyOwnMergePolicy</class-name>
39+
</map-merge-policy> </merge-policies> -->
2740

2841
</hazelcast>

‎distributed/src/test/resources/hazelcast-2.xml‎

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!-- ~ Copyright (c) 2008-2012, Hazel Bilisim Ltd. All Rights Reserved. ~ ~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may not
3-
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
4-
required by applicable law or agreed to in writing, software ~ distributed under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES OR
5-
CONDITIONS OF ANY KIND, either express or implied. ~ See the License for the specific language governing permissions and ~ limitations under the License. -->
2+
<!-- ~ Copyright (c) 2008-2012, Hazel Bilisim Ltd. All Rights Reserved. ~
3+
~ Licensed under the Apache License, Version 2.0 (the "License"); ~ you may
4+
not use this file except in compliance with the License. ~ You may obtain
5+
a copy of the License at ~ ~ http://www.apache.org/licenses/LICENSE-2.0 ~
6+
~ Unless required by applicable law or agreed to in writing, software ~ distributed
7+
under the License is distributed on an "AS IS" BASIS, ~ WITHOUT WARRANTIES
8+
OR CONDITIONS OF ANY KIND, either express or implied. ~ See the License for
9+
the specific language governing permissions and ~ limitations under the License. -->
610

7-
<hazelcast xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-2.1.xsd" xmlns="http://www.hazelcast.com/schema/config"
8-
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
11+
<hazelcast
12+
xsi:schemaLocation="http://www.hazelcast.com/schema/config hazelcast-config-2.1.xsd"
13+
xmlns="http://www.hazelcast.com/schema/config" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
914
<group>
1015
<name>orientdb</name>
1116
<password>orientdb</password>
@@ -14,7 +19,7 @@
1419
<port auto-increment="false">2435</port>
1520
<join>
1621
<multicast enabled="true">
17-
<multicast-group>235.1.1.1</multicast-group>
22+
<multicast-group>224.2.2.3</multicast-group>
1823
<multicast-port>2434</multicast-port>
1924
</multicast>
2025
</join>
@@ -24,10 +29,13 @@
2429
<max-pool-size>16</max-pool-size>
2530
<keep-alive-seconds>60</keep-alive-seconds>
2631
</executor-service>
27-
<!-- Add your own semaphore configurations here: <semaphore name="default"> <initial-permits>10</initial-permits> <semaphore-factory enabled="true"> <class-name>com.acme.MySemaphoreFactory</class-name>
28-
</semaphore-factory> </semaphore> -->
32+
<!-- Add your own semaphore configurations here: <semaphore name="default">
33+
<initial-permits>10</initial-permits> <semaphore-factory enabled="true">
34+
<class-name>com.acme.MySemaphoreFactory</class-name> </semaphore-factory>
35+
</semaphore> -->
2936

30-
<!-- Add your own map merge policy implementations here: <merge-policies> <map-merge-policy name="MY_MERGE_POLICY"> <class-name>com.acme.MyOwnMergePolicy</class-name>
37+
<!-- Add your own map merge policy implementations here: <merge-policies>
38+
<map-merge-policy name="MY_MERGE_POLICY"> <class-name>com.acme.MyOwnMergePolicy</class-name>
3139
</map-merge-policy> </merge-policies> -->
3240

3341
</hazelcast>

‎distributed/src/test/resources/orientdb-dserver-config-1.xml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,29 @@
5656
</listeners>
5757
</network>
5858
<storages>
59-
<storage loaded-at-startup="true" userPassword="admin" userName="admin" path="memory:temp" name="temp" />
6059
</storages>
6160
<users>
62-
<user resources="*" password="09725FA08AB11932720F67BF78907BCB3A3345624E0B93AEF773A8A79AFB1B6D" name="root" />
61+
<user resources="*" password="test" name="root" />
6362
<user resources="connect,server.listDatabases" password="guest" name="guest" />
6463
<user resources="database.passthrough" password="79498491C4D4F1360816D003E2004BC04606AA1C31B1A0E3BCF091A30EFDAB7D" name="replicator" />
6564
</users>
6665
<properties>
67-
<entry value="info" name="log.console.level" />
68-
<entry value="fine" name="log.file.level" />
66+
<!-- DATABASE POOL: size min/max -->
67+
<entry name="db.pool.min" value="1" />
68+
<entry name="db.pool.max" value="20" />
69+
70+
<!-- LEVEL1 AND 2 CACHE: enable/disable and set the size as number of entries -->
71+
<entry name="cache.level1.enabled" value="false" />
72+
<entry name="cache.level1.size" value="1000" />
73+
<entry name="cache.level2.enabled" value="true" />
74+
<entry name="cache.level2.size" value="1000" />
75+
76+
<!-- PROFILER: configures the profiler as <seconds-for-snapshot>,<archive-snapshot-size>,<summary-size> -->
77+
<entry name="profiler.enabled" value="true" />
78+
<!-- <entry name="profiler.config" value="30,10,10" /> -->
79+
80+
<!-- LOG: enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
81+
<entry name="log.console.level" value="info" />
82+
<entry name="log.file.level" value="fine" />
6983
</properties>
7084
</orient-server>

‎distributed/src/test/resources/orientdb-dserver-config-2.xml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,29 @@
5656
</listeners>
5757
</network>
5858
<storages>
59-
<storage loaded-at-startup="true" userPassword="admin" userName="admin" path="memory:temp" name="temp" />
6059
</storages>
6160
<users>
62-
<user resources="*" password="09725FA08AB11932720F67BF78907BCB3A3345624E0B93AEF773A8A79AFB1B6D" name="root" />
61+
<user resources="*" password="test" name="root" />
6362
<user resources="connect,server.listDatabases" password="guest" name="guest" />
6463
<user resources="database.passthrough" password="42BF13166BD3DCA08BF21DCD7BE9F1FFDCD81772B9467F6C61ABC634AEF14B77" name="replicator" />
6564
</users>
6665
<properties>
67-
<entry value="info" name="log.console.level" />
68-
<entry value="fine" name="log.file.level" />
66+
<!-- DATABASE POOL: size min/max -->
67+
<entry name="db.pool.min" value="1" />
68+
<entry name="db.pool.max" value="20" />
69+
70+
<!-- LEVEL1 AND 2 CACHE: enable/disable and set the size as number of entries -->
71+
<entry name="cache.level1.enabled" value="false" />
72+
<entry name="cache.level1.size" value="1000" />
73+
<entry name="cache.level2.enabled" value="true" />
74+
<entry name="cache.level2.size" value="1000" />
75+
76+
<!-- PROFILER: configures the profiler as <seconds-for-snapshot>,<archive-snapshot-size>,<summary-size> -->
77+
<entry name="profiler.enabled" value="true" />
78+
<!-- <entry name="profiler.config" value="30,10,10" /> -->
79+
80+
<!-- LOG: enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
81+
<entry name="log.console.level" value="info" />
82+
<entry name="log.file.level" value="fine" />
6983
</properties>
7084
</orient-server>

‎distributed/src/test/resources/orientdb-dserver-config-3.xml‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,29 @@
5555
</listeners>
5656
</network>
5757
<storages>
58-
<storage loaded-at-startup="true" userPassword="admin" userName="admin" path="memory:temp" name="temp"/>
5958
</storages>
6059
<users>
61-
<user resources="*" password="09725FA08AB11932720F67BF78907BCB3A3345624E0B93AEF773A8A79AFB1B6D" name="root"/>
60+
<user resources="*" password="test" name="root"/>
6261
<user resources="connect,server.listDatabases" password="guest" name="guest"/>
6362
<user resources="database.passthrough" password="32B77D61B488C37B8F06CE0086C0E03EFEC2BF99FFE62027D4DAFE4FC44B57AA" name="replicator"/>
6463
</users>
6564
<properties>
66-
<entry value="info" name="log.console.level"/>
67-
<entry value="fine" name="log.file.level"/>
65+
<!-- DATABASE POOL: size min/max -->
66+
<entry name="db.pool.min" value="1" />
67+
<entry name="db.pool.max" value="20" />
68+
69+
<!-- LEVEL1 AND 2 CACHE: enable/disable and set the size as number of entries -->
70+
<entry name="cache.level1.enabled" value="false" />
71+
<entry name="cache.level1.size" value="1000" />
72+
<entry name="cache.level2.enabled" value="true" />
73+
<entry name="cache.level2.size" value="1000" />
74+
75+
<!-- PROFILER: configures the profiler as <seconds-for-snapshot>,<archive-snapshot-size>,<summary-size> -->
76+
<entry name="profiler.enabled" value="true" />
77+
<!-- <entry name="profiler.config" value="30,10,10" /> -->
78+
79+
<!-- LOG: enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
80+
<entry name="log.console.level" value="info" />
81+
<entry name="log.file.level" value="fine" />
6882
</properties>
6983
</orient-server>

‎graphdb/config/orientdb-dserver-config.xml‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,20 @@
2727
<parameter name="db.exclude" value="" /><!-- USE COMMA TO SEPARATE MULTIPLE DATABASE NAMES -->
2828
</parameters>
2929
</handler>
30+
<!-- MAIL, TO TURN ON SET THE 'ENABLED' PARAMETER TO 'true' -->
31+
<handler class="com.orientechnologies.orient.server.plugin.mail.OMailPlugin">
32+
<parameters>
33+
<parameter name="enabled" value="true" />
34+
<!-- CREATE MULTIPLE PROFILES WITH profile.<name>... -->
35+
<parameter name="profile.default.mail.smtp.host" value="localhost" />
36+
<parameter name="profile.default.mail.smtp.port" value="25" />
37+
<parameter name="profile.default.mail.smtp.auth" value="true" />
38+
<parameter name="profile.default.mail.smtp.starttls.enable" value="true" />
39+
<parameter name="profile.default.mail.smtp.user" value="" />
40+
<parameter name="profile.default.mail.smtp.password" value="" />
41+
<parameter name="profile.default.mail.date.format" value="yyyy-MM-dd HH:mm:ss" />
42+
</parameters>
43+
</handler>
3044
<!-- SERVER SIDE SCRIPT INTERPRETER. WARNING! THIS CAN BE A SECURITY HOLE: ENABLE IT ONLY IF CLIENTS ARE TRUCT, TO TURN ON SET THE 'ENABLED' PARAMETER
3145
TO 'true' -->
3246
<handler class="com.orientechnologies.orient.server.handler.OServerSideScriptInterpreter">
@@ -78,7 +92,21 @@
7892
<!-- Uses the Hazelcast's distributed cache as 2nd level cache -->
7993
<!-- <entry name="cache.level2.impl" value="com.orientechnologies.orient.server.hazelcast.OHazelcastCache" /> -->
8094

81-
<!-- Enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
95+
<!-- DATABASE POOL: size min/max -->
96+
<entry name="db.pool.min" value="1" />
97+
<entry name="db.pool.max" value="20" />
98+
99+
<!-- LEVEL1 AND 2 CACHE: enable/disable and set the size as number of entries -->
100+
<entry name="cache.level1.enabled" value="false" />
101+
<entry name="cache.level1.size" value="1000" />
102+
<entry name="cache.level2.enabled" value="true" />
103+
<entry name="cache.level2.size" value="1000" />
104+
105+
<!-- PROFILER: configures the profiler as <seconds-for-snapshot>,<archive-snapshot-size>,<summary-size> -->
106+
<entry name="profiler.enabled" value="true" />
107+
<!-- <entry name="profiler.config" value="30,10,10" /> -->
108+
109+
<!-- LOG: enable/Disable logging. Levels are: finer, fine, finest, info, warning -->
82110
<entry name="log.console.level" value="info" />
83111
<entry name="log.file.level" value="fine" />
84112
</properties>

‎server/src/main/java/com/orientechnologies/orient/server/network/protocol/binary/OBinaryNetworkProtocolAbstract.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public OBinaryNetworkProtocolAbstract(final String iThreadName) {
7676
/**
7777
* Executes the request.
7878
*
79-
* @return true if the request has been recognized, othereise false
79+
* @return true if the request has been recognized, otherwise false
8080
* @throws IOException
8181
*/
8282
protected abstract boolean executeRequest() throws IOException;

0 commit comments

Comments
 (0)