This is an automated email from the ASF dual-hosted git repository.

captainzmc pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git


The following commit(s) were added to refs/heads/master by this push:
     new 9d30c9a7ce HDDS-7606. Add SCM HA support in intellij run (#4058)
9d30c9a7ce is described below

commit 9d30c9a7ce375cd614e86022850c7c128723df6b
Author: Sammi Chen <[email protected]>
AuthorDate: Fri Jan 6 11:16:51 2023 +0800

    HDDS-7606. Add SCM HA support in intellij run (#4058)
    
    * HDDS-7606. Add SCM HA support in intellij run.
---
 .../dev-support/intellij/ozone-site-ha.xml         | 174 +++++++++++++++++++++
 ...torageContainerManager.xml => Datanode1-ha.xml} |   8 +-
 ...torageContainerManager.xml => Datanode2-ha.xml} |   8 +-
 ...torageContainerManager.xml => Datanode3-ha.xml} |   8 +-
 ...ageContainerManager.xml => OzoneFsShell-ha.xml} |  13 +-
 ...ageContainerManager.xml => OzoneManager-ha.xml} |   8 +-
 ...ontainerManager.xml => OzoneManagerInit-ha.xml} |   8 +-
 ...orageContainerManager.xml => OzoneShell-ha.xml} |   8 +-
 ...geContainerManager.xml => PrimordialSCM-ha.xml} |   4 +-
 ...ntainerManager.xml => PrimordialSCMInit-ha.xml} |   4 +-
 .../{StorageContainerManager.xml => Recon-ha.xml}  |   8 +-
 .../{StorageContainerManager.xml => Scm2-ha.xml}   |   4 +-
 ...geContainerManager.xml => Scm2Bootstrap-ha.xml} |   4 +-
 .../{StorageContainerManager.xml => Scm3-ha.xml}   |   4 +-
 ...geContainerManager.xml => Scm3Bootstrap-ha.xml} |   4 +-
 .../{StorageContainerManager.xml => ScmRoles.xml}  |   8 +-
 .../runConfigurations/StorageContainerManager.xml  |   2 +-
 17 files changed, 227 insertions(+), 50 deletions(-)

diff --git a/hadoop-ozone/dev-support/intellij/ozone-site-ha.xml 
b/hadoop-ozone/dev-support/intellij/ozone-site-ha.xml
new file mode 100644
index 0000000000..ff7883fc55
--- /dev/null
+++ b/hadoop-ozone/dev-support/intellij/ozone-site-ha.xml
@@ -0,0 +1,174 @@
+<!--
+   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.
+-->
+<configuration>
+  <property>
+    <name>hdds.profiler.endpoint.enabled</name>
+    <value>true</value>
+  </property>
+  <property>
+    <name>ozone.scm.block.client.address</name>
+    <value>localhost</value>
+  </property>
+  <property>
+    <name>ozone.csi.owner</name>
+    <value>hadoop</value>
+  </property>
+  <property>
+    <name>ozone.csi.socket</name>
+    <value>/tmp/csi.sock</value>
+  </property>
+  <property>
+    <name>ozone.scm.client.address</name>
+    <value>localhost</value>
+  </property>
+  <property>
+    <name>ozone.metadata.dirs</name>
+    <value>/tmp/metadata</value>
+  </property>
+  <property>
+    <name>ozone.scm.ratis.enable</name>
+    <value>true</value>
+  </property>
+  <property>
+    <name>ozone.scm.service.ids</name>
+    <value>scm-group</value>
+  </property>
+  <property>
+    <name>ozone.scm.nodes.scm-group</name>
+    <value>scm1,scm2,scm3</value>
+  </property>
+  <property>
+    <name>ozone.scm.address.scm-group.scm1</name>
+    <value>localhost</value>
+  </property>
+  <property>
+    <name>ozone.scm.address.scm-group.scm2</name>
+    <value>localhost</value>
+  </property>
+  <property>
+    <name>ozone.scm.address.scm-group.scm3</name>
+    <value>localhost</value>
+  </property>
+  <property>
+    <name>ozone.scm.client.port.scm-group.scm1</name>
+    <value>19860</value>
+  </property>
+  <property>
+    <name>ozone.scm.client.port.scm-group.scm2</name>
+    <value>29860</value>
+  </property>
+  <property>
+    <name>ozone.scm.client.port.scm-group.scm3</name>
+    <value>39860</value>
+  </property>
+  <property>
+    <name>ozone.scm.datanode.port.scm-group.scm1</name>
+    <value>19861</value>
+  </property>
+  <property>
+    <name>ozone.scm.datanode.port.scm-group.scm2</name>
+    <value>29861</value>
+  </property>
+  <property>
+    <name>ozone.scm.datanode.port.scm-group.scm3</name>
+    <value>39861</value>
+  </property>
+  <property>
+    <name>ozone.scm.block.client.port.scm-group.scm1</name>
+    <value>19863</value>
+  </property>
+  <property>
+    <name>ozone.scm.block.client.port.scm-group.scm2</name>
+    <value>29863</value>
+  </property>
+  <property>
+    <name>ozone.scm.block.client.port.scm-group.scm3</name>
+    <value>39863</value>
+  </property>
+  <property>
+    <name>ozone.scm.security.service.port.scm-group.scm1</name>
+    <value>19961</value>
+  </property>
+  <property>
+    <name>ozone.scm.security.service.port.scm-group.scm2</name>
+    <value>29961</value>
+  </property>
+  <property>
+    <name>ozone.scm.security.service.port.scm-group.scm3</name>
+    <value>39961</value>
+  </property>
+  <property>
+    <name>ozone.scm.ratis.port.scm-group.scm1</name>
+    <value>19894</value>
+  </property>
+  <property>
+    <name>ozone.scm.ratis.port.scm-group.scm2</name>
+    <value>29894</value>
+  </property>
+  <property>
+    <name>ozone.scm.ratis.port.scm-group.scm3</name>
+    <value>39894</value>
+  </property>
+  <property>
+    <name>ozone.scm.grpc.port.scm-group.scm1</name>
+    <value>19895</value>
+  </property>
+  <property>
+    <name>ozone.scm.grpc.port.scm-group.scm2</name>
+    <value>29895</value>
+  </property>
+  <property>
+    <name>ozone.scm.grpc.port.scm-group.scm3</name>
+    <value>39895</value>
+  </property>
+
+  <property>
+    <name>ozone.om.address</name>
+    <value>localhost</value>
+  </property>
+  <property>
+    <name>ozone.scm.container.size</name>
+    <value>1G</value>
+  </property>
+  <property>
+    <name>hdds.datanode.storage.utilization.critical.threshold</name>
+    <value>0.99</value>
+  </property>
+  <property>
+    <name>hdds.prometheus.endpoint.enabled</name>
+    <value>true</value>
+  </property>
+
+  <property>
+    <name>ozone.recon.address</name>
+    <value>localhost:9891</value>
+  </property>
+  <property>
+    <name>ozone.recon.db.dir</name>
+    <value>/tmp/recon</value>
+  </property>
+
+  <property>
+    <name>datanode.replication.port</name>
+    <value>0</value>
+  </property>
+
+  <property>
+    <name>ozone.security.enabled</name>
+    <value>false</value>
+  </property>
+</configuration>
\ No newline at end of file
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode1-ha.xml
similarity index 78%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/Datanode1-ha.xml
index a4f894ec1f..ad1e735d6b 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode1-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
-    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
-    <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+  <configuration default="false" name="Datanode1-ha" type="Application" 
factoryName="Application">
+    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.ozone.HddsDatanodeService" />
+    <module name="ozone-datanode" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set 
ozone.metadata.dirs=/tmp/datanode1 --set 
hdds.datanode.dir=/tmp/datanode1/storage" />
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2-ha.xml
similarity index 69%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2-ha.xml
index a4f894ec1f..a4edccfcee 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode2-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
-    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
-    <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+  <configuration default="false" name="Datanode2-ha" type="Application" 
factoryName="Application">
+    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.ozone.HddsDatanodeService" />
+    <module name="ozone-datanode" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set 
ozone.metadata.dirs=/tmp/datanode2 --set 
hdds.datanode.dir=/tmp/datanode2/storage --set 
hdds.datanode.http-address=127.0.0.1:10021 --set dfs.container.ratis.ipc=10022 
--set dfs.container.ipc=10023 --set dfs.container.ratis.server.port=10024 --set 
dfs.container.ratis.admin.port=10025 --set 
hdds.datanode.replication.port=10026" />
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3-ha.xml
similarity index 69%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3-ha.xml
index a4f894ec1f..55315f08ac 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Datanode3-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
-    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
-    <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+  <configuration default="false" name="Datanode3-ha" type="Application" 
factoryName="Application">
+    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.ozone.HddsDatanodeService" />
+    <module name="ozone-datanode" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set 
ozone.metadata.dirs=/tmp/datanode3 --set 
hdds.datanode.dir=/tmp/datanode3/storage --set 
hdds.datanode.http-address=127.0.0.1:10031 --set dfs.container.ratis.ipc=10032 
--set dfs.container.ipc=10033 --set dfs.container.ratis.server.port=10034 --set 
dfs.container.ratis.admin.port=10035 --set 
hdds.datanode.replication.port=10036" />
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneFsShell-ha.xml
similarity index 70%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/OzoneFsShell-ha.xml
index a4f894ec1f..6f8d82de47 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneFsShell-ha.xml
@@ -15,11 +15,14 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
-    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
-    <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
-    <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
+  <configuration default="false" name="OzoneFsShell-ha" type="Application" 
factoryName="Application">
+    <envs>
+      <env name="OZONE_CONF_DIR" 
value="$PROJECT_DIR$/hadoop-ozone/dev-support/intellij" />
+    </envs>
+    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.fs.ozone.OzoneFsShell" />
+    <module name="ozone-tools" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml -ls -R 
o3fs://bucket1.vol1/" />
+    <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties
 -Xbootclasspath/a:$PROJECT_DIR$/hadoop-ozone/dev-support/intellij" />
     <extension name="coverage">
       <pattern>
         <option name="PATTERN" value="org.apache.hadoop.ozone.*" />
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManager-ha.xml
similarity index 80%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManager-ha.xml
index a4f894ec1f..26d32c2488 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManager-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
-    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
-    <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+  <configuration default="false" name="OzoneManager-ha" type="Application" 
factoryName="Application">
+    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.ozone.om.OzoneManagerStarter" />
+    <module name="ozone-manager" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml" />
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManagerInit-ha.xml
similarity index 80%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to 
hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManagerInit-ha.xml
index a4f894ec1f..c1f6f0e1ad 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ 
b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneManagerInit-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
-    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
-    <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+  <configuration default="false" name="OzoneManagerInit-ha" type="Application" 
factoryName="Application">
+    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.ozone.om.OzoneManagerStarter" />
+    <module name="ozone-manager" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --init" />
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneShell-ha.xml
similarity index 80%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/OzoneShell-ha.xml
index a4f894ec1f..e0eef05ae9 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/OzoneShell-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
-    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
-    <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+  <configuration default="false" name="OzoneShell-ha" type="Application" 
factoryName="Application">
+    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.ozone.shell.OzoneShell" />
+    <module name="ozone-tools" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml volume create 
/vol1" />
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/PrimordialSCM-ha.xml
similarity index 85%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/PrimordialSCM-ha.xml
index a4f894ec1f..9ff99d1b2c 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/PrimordialSCM-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
+  <configuration default="false" name="PrimordialSCM-ha" type="Application" 
factoryName="Application">
     <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set 
ozone.scm.node.id=scm1 --set ozone.metadata.dirs=/tmp/scm1 --set 
ozone.scm.http-address=127.0.0.1:19876" />
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/PrimordialSCMInit-ha.xml
similarity index 83%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to 
hadoop-ozone/dev-support/intellij/runConfigurations/PrimordialSCMInit-ha.xml
index a4f894ec1f..011499c816 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ 
b/hadoop-ozone/dev-support/intellij/runConfigurations/PrimordialSCMInit-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
+  <configuration default="false" name="PrimordialSCMInit-ha" 
type="Application" factoryName="Application" nameIsGenerated="false">
     <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set 
ozone.metadata.dirs=/tmp/scm1 --set ozone.scm.node.id=scm1 --set 
ozone.scm.http-address=127.0.0.1:19876 --init" />"
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/Recon-ha.xml
similarity index 80%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/Recon-ha.xml
index a4f894ec1f..fb4135c9a6 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Recon-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
-    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
-    <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+  <configuration default="false" name="Recon-ha" type="Application" 
factoryName="Application">
+    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.ozone.recon.ReconServer" />
+    <module name="ozone-recon" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml" />
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/Scm2-ha.xml
similarity index 84%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/Scm2-ha.xml
index a4f894ec1f..7d48186208 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Scm2-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
+  <configuration default="false" name="Scm2-ha" type="Application" 
factoryName="Application" nameIsGenerated="false">
     <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set 
ozone.metadata.dirs=/tmp/scm2 --set ozone.scm.node.id=scm2 --set 
ozone.scm.http-address=127.0.0.1:29876" />
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/Scm2Bootstrap-ha.xml
similarity index 83%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/Scm2Bootstrap-ha.xml
index a4f894ec1f..267f27b029 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Scm2Bootstrap-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
+  <configuration default="false" name="Scm2Bootstrap-ha" type="Application" 
factoryName="Application" nameIsGenerated="false">
     <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set 
ozone.metadata.dirs=/tmp/scm2 --set ozone.scm.node.id=scm2 --set 
ozone.scm.http-address=127.0.0.1:29876 --bootstrap" />"
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/Scm3-ha.xml
similarity index 84%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/Scm3-ha.xml
index a4f894ec1f..9c0623803b 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Scm3-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
+  <configuration default="false" name="Scm3-ha" type="Application" 
factoryName="Application" nameIsGenerated="false">
     <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set 
ozone.metadata.dirs=/tmp/scm3 --set ozone.scm.node.id=scm3 --set 
ozone.scm.http-address=127.0.0.1:39876" />
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/Scm3Bootstrap-ha.xml
similarity index 83%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/Scm3Bootstrap-ha.xml
index a4f894ec1f..96bbb24e60 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/Scm3Bootstrap-ha.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
+  <configuration default="false" name="Scm3Bootstrap-ha" type="Application" 
factoryName="Application" nameIsGenerated="false">
     <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml --set 
ozone.metadata.dirs=/tmp/scm3 --set ozone.scm.node.id=scm3 --set 
ozone.scm.http-address=127.0.0.1:39876 --bootstrap" />
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 b/hadoop-ozone/dev-support/intellij/runConfigurations/ScmRoles.xml
similarity index 84%
copy from 
hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
copy to hadoop-ozone/dev-support/intellij/runConfigurations/ScmRoles.xml
index a4f894ec1f..0dddc3add3 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ b/hadoop-ozone/dev-support/intellij/runConfigurations/ScmRoles.xml
@@ -15,10 +15,10 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
-    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
-    <module name="hdds-server-scm" />
-    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />
+  <configuration default="false" name="ScmRoles" type="Application" 
factoryName="Application">
+    <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.cli.OzoneAdmin" />
+    <module name="hdds-tools" />
+    <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site-ha.xml scm roles 
-id=scm-group" />
     <option name="VM_PARAMETERS" 
value="-Dlog4j.configuration=file:hadoop-ozone/dev-support/intellij/log4j.properties"
 />
     <extension name="coverage">
       <pattern>
diff --git 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
 
b/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
index a4f894ec1f..0d26691fc9 100644
--- 
a/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
+++ 
b/hadoop-ozone/dev-support/intellij/runConfigurations/StorageContainerManager.xml
@@ -15,7 +15,7 @@
    limitations under the License.
 -->
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="falsee">
+  <configuration default="false" name="StorageContainerManager" 
type="Application" factoryName="Application" nameIsGenerated="false">
     <option name="MAIN_CLASS_NAME" 
value="org.apache.hadoop.hdds.scm.server.StorageContainerManagerStarter" />
     <module name="hdds-server-scm" />
     <option name="PROGRAM_PARAMETERS" 
value="-conf=hadoop-ozone/dev-support/intellij/ozone-site.xml" />


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to