Skip to content

Commit 61a2bbc

Browse files
committed
fix unit tests
1 parent 3a1991e commit 61a2bbc

File tree

4 files changed

+52
-3
lines changed

4 files changed

+52
-3
lines changed

hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@ public OzoneConfiguration(Configuration conf) {
5555
super(conf);
5656
//load the configuration from the classloader of the original conf.
5757
setClassLoader(conf.getClassLoader());
58-
loadDefaults();
58+
if (!(conf instanceof OzoneConfiguration)) {
59+
loadDefaults();
60+
}
5961
}
6062

6163
private void loadDefaults() {

hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigFileGenerator.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@
3636
import java.util.Set;
3737

3838
/**
39-
* Annotation processor to generate ozone-site-generated fragments from
40-
* @Config annotations.
39+
* Annotation processor to generate config fragments from Config annotations.
4140
*/
4241
@SupportedAnnotationTypes("org.apache.hadoop.hdds.conf.ConfigGroup")
4342
public class ConfigFileGenerator extends AbstractProcessor {
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0"?>
2+
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one or more
5+
contributor license agreements. See the NOTICE file distributed with
6+
this work for additional information regarding copyright ownership.
7+
The ASF licenses this file to You under the Apache License, Version 2.0
8+
(the "License"); you may not use this file except in compliance with
9+
the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
-->
19+
20+
<!-- Put site-specific property overrides in this file. -->
21+
22+
<configuration>
23+
24+
</configuration>
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0"?>
2+
<?xml-stylesheet type="text/xsl" href="configuration.xsl"?>
3+
<!--
4+
Licensed to the Apache Software Foundation (ASF) under one or more
5+
contributor license agreements. See the NOTICE file distributed with
6+
this work for additional information regarding copyright ownership.
7+
The ASF licenses this file to You under the Apache License, Version 2.0
8+
(the "License"); you may not use this file except in compliance with
9+
the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing, software
14+
distributed under the License is distributed on an "AS IS" BASIS,
15+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
See the License for the specific language governing permissions and
17+
limitations under the License.
18+
-->
19+
20+
<!-- Put site-specific property overrides in this file. -->
21+
22+
<configuration>
23+
24+
</configuration>

0 commit comments

Comments
 (0)