Skip to content

Commit 87d1039

Browse files
lidongsjtulidongsjtu
committed
KYLIN-2413 update test conf files
1 parent eb73da7 commit 87d1039

11 files changed

+380
-150
lines changed

‎dev-support/sync_hbase_cdh_branches.sh

+4-11
Original file line numberDiff line numberDiff line change
@@ -37,24 +37,17 @@ trap 'error ${LINENO} ${?}' ERR
3737
# ============================================================================
3838

3939
git fetch apache
40-
git checkout apache/$base-hbase1.x
41-
git format-patch -1
42-
git checkout apache/$base-cdh5.7
40+
git checkout apache/$base-hbase0.98
4341
git format-patch -1
4442

4543
git checkout apache/$base
4644
git checkout -b tmp
4745
git reset apache/$base --hard
4846

49-
git am -3 --ignore-whitespace 0001-KYLIN-1528-Create-a-branch-for-v1.5-with-HBase-1.x-A.patch
50-
mvn clean compile -DskipTests
51-
git push apache tmp:$base-hbase1.x -f
52-
rm 0001-KYLIN-1528-Create-a-branch-for-v1.5-with-HBase-1.x-A.patch
53-
54-
git am -3 --ignore-whitespace 0001-KYLIN-1672-support-kylin-on-cdh-5.7.patch
47+
git am -3 --ignore-whitespace 0001-KYLIN-2307-Create-a-branch-for-master-with-HBase-0.9.patch
5548
mvn clean compile -DskipTests
56-
git push apache tmp:$base-cdh5.7 -f
57-
rm 0001-KYLIN-1672-support-kylin-on-cdh-5.7.patch
49+
git push apache tmp:$base-hbase0.98 -f
50+
rm 0001-KYLIN-2307-Create-a-branch-for-master-with-HBase-0.9.patch
5851

5952
# clean up
6053
git checkout master

‎dev-support/test_all_against_hdp_2_2_4_2_2.sh ‎dev-support/test_all_against_hdp_2_4_0_0_169.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ cd ${dir}
2222
cd ..
2323

2424
mvn clean install -DskipTests 2>&1 | tee mci.log
25-
mvn verify -Dhdp.version=${HDP_VERSION:-"2.2.4.2-2"} -fae 2>&1 | tee mvnverify.log
25+
mvn verify -Dhdp.version=${HDP_VERSION:-"2.4.0.0-169"} -fae 2>&1 | tee mvnverify.log

‎examples/test_case_data/sandbox/capacity-scheduler.xml

+1-16
Original file line numberDiff line numberDiff line change
@@ -46,16 +46,6 @@
4646
<value>*</value>
4747
</property>
4848

49-
<property>
50-
<name>yarn.scheduler.capacity.root.accessible-node-labels.default.capacity</name>
51-
<value>-1</value>
52-
</property>
53-
54-
<property>
55-
<name>yarn.scheduler.capacity.root.accessible-node-labels.default.maximum-capacity</name>
56-
<value>-1</value>
57-
</property>
58-
5949
<property>
6050
<name>yarn.scheduler.capacity.root.acl_administer_queue</name>
6151
<value>*</value>
@@ -66,11 +56,6 @@
6656
<value>100</value>
6757
</property>
6858

69-
<property>
70-
<name>yarn.scheduler.capacity.root.default-node-label-expression</name>
71-
<value></value>
72-
</property>
73-
7459
<property>
7560
<name>yarn.scheduler.capacity.root.default.acl_administer_jobs</name>
7661
<value>*</value>
@@ -111,4 +96,4 @@
11196
<value>default</value>
11297
</property>
11398

114-
</configuration>
99+
</configuration>

‎examples/test_case_data/sandbox/core-site.xml

+28-7
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<property>
2020
<name>fs.defaultFS</name>
2121
<value>hdfs://sandbox.hortonworks.com:8020</value>
22-
<final>true</final>
2322
</property>
2423

2524
<property>
@@ -39,7 +38,7 @@
3938

4039
<property>
4140
<name>hadoop.proxyuser.falcon.groups</name>
42-
<value>users</value>
41+
<value>*</value>
4342
</property>
4443

4544
<property>
@@ -49,7 +48,7 @@
4948

5049
<property>
5150
<name>hadoop.proxyuser.hbase.groups</name>
52-
<value>users</value>
51+
<value>*</value>
5352
</property>
5453

5554
<property>
@@ -67,14 +66,24 @@
6766
<value>sandbox.hortonworks.com</value>
6867
</property>
6968

69+
<property>
70+
<name>hadoop.proxyuser.hdfs.groups</name>
71+
<value>*</value>
72+
</property>
73+
74+
<property>
75+
<name>hadoop.proxyuser.hdfs.hosts</name>
76+
<value>*</value>
77+
</property>
78+
7079
<property>
7180
<name>hadoop.proxyuser.hive.groups</name>
72-
<value>users</value>
81+
<value>*</value>
7382
</property>
7483

7584
<property>
7685
<name>hadoop.proxyuser.hive.hosts</name>
77-
<value>*</value>
86+
<value>sandbox.hortonworks.com</value>
7887
</property>
7988

8089
<property>
@@ -122,9 +131,16 @@
122131
<value>false</value>
123132
</property>
124133

134+
<property>
135+
<name>hadoop.security.key.provider.path</name>
136+
<value></value>
137+
</property>
138+
125139
<property>
126140
<name>io.compression.codecs</name>
127-
<value>org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.SnappyCodec</value>
141+
<value>
142+
org.apache.hadoop.io.compress.GzipCodec,org.apache.hadoop.io.compress.DefaultCodec,org.apache.hadoop.io.compress.SnappyCodec
143+
</value>
128144
</property>
129145

130146
<property>
@@ -162,4 +178,9 @@
162178
<value>false</value>
163179
</property>
164180

165-
</configuration>
181+
<property>
182+
<name>net.topology.script.file.name</name>
183+
<value>/etc/hadoop/conf/topology_script.py</value>
184+
</property>
185+
186+
</configuration>

‎examples/test_case_data/sandbox/hadoop-policy.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@
7171
<value>hadoop</value>
7272
</property>
7373

74-
</configuration>
74+
</configuration>

‎examples/test_case_data/sandbox/hbase-policy.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,4 @@
3131
<value>*</value>
3232
</property>
3333

34-
</configuration>
34+
</configuration>

‎examples/test_case_data/sandbox/hbase-site.xml

+86-14
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,34 @@
2121
<value>/var/lib/hadoop-hdfs/dn_socket</value>
2222
</property>
2323

24+
<property>
25+
<name>hbase.bucketcache.ioengine</name>
26+
<value></value>
27+
</property>
28+
29+
<property>
30+
<name>hbase.bucketcache.percentage.in.combinedcache</name>
31+
<value></value>
32+
</property>
33+
34+
<property>
35+
<name>hbase.bucketcache.size</name>
36+
<value></value>
37+
</property>
38+
39+
<property>
40+
<name>hbase.bulkload.staging.dir</name>
41+
<value>/apps/hbase/staging</value>
42+
</property>
43+
2444
<property>
2545
<name>hbase.client.keyvalue.maxsize</name>
26-
<value>10485760</value>
46+
<value>1048576</value>
47+
</property>
48+
49+
<property>
50+
<name>hbase.client.retries.number</name>
51+
<value>35</value>
2752
</property>
2853

2954
<property>
@@ -38,12 +63,19 @@
3863

3964
<property>
4065
<name>hbase.coprocessor.master.classes</name>
41-
<value>com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor</value>
66+
<value>org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor</value>
4267
</property>
4368

4469
<property>
4570
<name>hbase.coprocessor.region.classes</name>
46-
<value>com.xasecure.authorization.hbase.XaSecureAuthorizationCoprocessor</value>
71+
<value>
72+
org.apache.hadoop.hbase.security.access.SecureBulkLoadEndpoint,org.apache.ranger.authorization.hbase.RangerAuthorizationCoprocessor
73+
</value>
74+
</property>
75+
76+
<property>
77+
<name>hbase.coprocessor.regionserver.classes</name>
78+
<value></value>
4779
</property>
4880

4981
<property>
@@ -86,6 +118,11 @@
86118
<value>10</value>
87119
</property>
88120

121+
<property>
122+
<name>hbase.hstore.compaction.max</name>
123+
<value>10</value>
124+
</property>
125+
89126
<property>
90127
<name>hbase.hstore.compactionThreshold</name>
91128
<value>3</value>
@@ -103,44 +140,69 @@
103140

104141
<property>
105142
<name>hbase.master.info.port</name>
106-
<value>60010</value>
143+
<value>16010</value>
107144
</property>
108145

109146
<property>
110147
<name>hbase.master.port</name>
111-
<value>60000</value>
148+
<value>16000</value>
112149
</property>
113150

114151
<property>
115-
<name>hbase.regionserver.global.memstore.lowerLimit</name>
116-
<value>0.38</value>
152+
<name>hbase.region.server.rpc.scheduler.factory.class</name>
153+
<value></value>
117154
</property>
118155

119156
<property>
120-
<name>hbase.regionserver.global.memstore.upperLimit</name>
157+
<name>hbase.regionserver.global.memstore.size</name>
121158
<value>0.4</value>
122159
</property>
123160

124161
<property>
125162
<name>hbase.regionserver.handler.count</name>
126-
<value>60</value>
163+
<value>30</value>
127164
</property>
128165

129166
<property>
130167
<name>hbase.regionserver.info.port</name>
131-
<value>60030</value>
168+
<value>16030</value>
169+
</property>
170+
171+
<property>
172+
<name>hbase.regionserver.port</name>
173+
<value>16020</value>
174+
</property>
175+
176+
<property>
177+
<name>hbase.regionserver.wal.codec</name>
178+
<value>org.apache.hadoop.hbase.regionserver.wal.WALCellCodec</value>
132179
</property>
133180

134181
<property>
135182
<name>hbase.rootdir</name>
136183
<value>hdfs://sandbox.hortonworks.com:8020/apps/hbase/data</value>
137184
</property>
138185

186+
<property>
187+
<name>hbase.rpc.controllerfactory.class</name>
188+
<value></value>
189+
</property>
190+
191+
<property>
192+
<name>hbase.rpc.engine</name>
193+
<value>org.apache.hadoop.hbase.ipc.SecureRpcEngine</value>
194+
</property>
195+
139196
<property>
140197
<name>hbase.rpc.protection</name>
141198
<value>PRIVACY</value>
142199
</property>
143200

201+
<property>
202+
<name>hbase.rpc.timeout</name>
203+
<value>90000</value>
204+
</property>
205+
144206
<property>
145207
<name>hbase.security.authentication</name>
146208
<value>simple</value>
@@ -158,7 +220,7 @@
158220

159221
<property>
160222
<name>hbase.tmp.dir</name>
161-
<value>/hadoop/hbase</value>
223+
<value>/tmp/hbase-${user.name}</value>
162224
</property>
163225

164226
<property>
@@ -178,17 +240,27 @@
178240

179241
<property>
180242
<name>hfile.block.cache.size</name>
181-
<value>0.40</value>
243+
<value>0.4</value>
244+
</property>
245+
246+
<property>
247+
<name>phoenix.functions.allowUserDefinedFunctions</name>
248+
<value></value>
249+
</property>
250+
251+
<property>
252+
<name>phoenix.query.timeoutMs</name>
253+
<value>60000</value>
182254
</property>
183255

184256
<property>
185257
<name>zookeeper.session.timeout</name>
186-
<value>30000</value>
258+
<value>60000</value>
187259
</property>
188260

189261
<property>
190262
<name>zookeeper.znode.parent</name>
191263
<value>/hbase-unsecure</value>
192264
</property>
193265

194-
</configuration>
266+
</configuration>

0 commit comments

Comments
 (0)