Skip to content

Commit f80c21d

Browse files
committed
Adjust the order of activation methods
1 parent e367e7a commit f80c21d

File tree

24 files changed

+467
-565
lines changed

24 files changed

+467
-565
lines changed

src/UserGuide/Master/Table/Deployment-and-Maintenance/Cluster-Deployment_timecho.md

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -159,13 +159,7 @@ On each server, navigate to the `sbin` directory and start the DataNode:
159159

160160
### 3.6 Activate the Database
161161

162-
#### Option 1: File-Based Activation
163-
164-
1. Start all ConfigNodes and DataNodes.
165-
2. Copy the `system_info` file from the `activation` directory on each server and send them to the Timecho team.
166-
3. Place the license files provided by the Timecho team into the corresponding `activation` folder for each node.
167-
168-
#### Option 2: Command-Based Activation
162+
#### Option 1: Command-Based Activation
169163

170164
1. Enter the IoTDB CLI on any node of the cluster:
171165
- **For Table Model**:
@@ -177,22 +171,14 @@ On each server, navigate to the `sbin` directory and start the DataNode:
177171
./start-cli.bat -sql_dialect table
178172
```
179173

180-
- **For Tree Model**:
181-
```SQL
182-
# For Linux or macOS
183-
./start-cli.sh
184-
185-
# For Windows
186-
./start-cli.bat
187-
```
188174
2. Run the following command to retrieve the machine code required for activation:
189175

190176
```Bash
191177
show system info
192178
```
193179

194180

195-
3. Copy the returned machine codes of all 3 nodes in the cluster (displayed as a green string) and send it to the Timecho team:
181+
3. Copy the returned machine codes of all nodes in the cluster (displayed as a green string) and send it to the Timecho team:
196182

197183
```Bash
198184
+--------------------------------------------------------------+
@@ -210,6 +196,14 @@ It costs 0.030s
210196
IoTDB> activate '01-D4EYQGPZ-EAUJJODW-NUKRDR6F-TUQS3B75-EDZFLK3A-6BOKJFFZ-ALDHOMN7-NB2E4BHI-7ZKGFVK6-GCIFXA4T-UG3XJTTD-SHJV6F2P-Q27B4OMJ-R47ZDIM3-UUASUXG2-OQXGVZCO-MMYKICZU-TWFQYYAO-ZOAGOKJA-NYHQTA5U-EWAR4EP5-MRC6R2CI-PKUTKRCT-7UDGRH3F-7BYV4P5D-6KKIA===,01-D4EYQGPZ-EAUJJODW-NUKRDR6F-TUQS3B75-EDZFLK3A-6BOKJFFZ-ALDHOMN7-NB2E4BHI-7ZKGFVK6-GCIFXA4T-UG3XJTTD-SHJV6F2P-Q27B4OMJ-R47ZDIM3-UUASUXG2-OQXGVZCO-MMYKICZU-TWFQYYAO-ZOAGOKJA-NYHQTA5U-EWAR4EP5-MRC6R2CI-PKUTKRCT-7UDGRH3F-7BYV4P5D-6KKIA===,01-D4EYQGPZ-EAUJJODW-NUKRDR6F-TUQS3B75-EDZFLK3A-6BOKJFFZ-ALDHOMN7-NB2E4BHI-7ZKGFVK6-GCIFXA4T-UG3XJTTD-SHJV6F2P-Q27B4OMJ-R47ZDIM3-UUASUXG2-OQXGVZCO-MMYKICZU-TWFQYYAO-ZOAGOKJA-NYHQTA5U-EWAR4EP5-MRC6R2CI-PKUTKRCT-7UDGRH3F-7BYV4P5D-6KKIA==='
211197
```
212198
199+
200+
#### Option 2: File-Based Activation
201+
202+
1. Start all ConfigNodes and DataNodes.
203+
2. Copy the `system_info` file from the `activation` directory on each server and send them to the Timecho team.
204+
3. Place the license files provided by the Timecho team into the corresponding `activation` folder for each node.
205+
206+
213207
### 3.7 Verify Activation
214208
215209
Check the `ClusterActivationStatus` field. If it shows `ACTIVATED`, the database has been successfully activated.

src/UserGuide/Master/Table/Deployment-and-Maintenance/Stand-Alone-Deployment_timecho.md

Lines changed: 10 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,7 @@ Navigate to the `sbin` directory of IoTDB and start the DataNode:
126126

127127
### 2.5 Activate the Database
128128

129-
#### Option 1: File-Based Activation
130-
131-
- Start both the ConfigNode and DataNode.
132-
- Navigate to the `activation` folder and copy the `system_info` file.
133-
- Send the `system_info` file to the Timecho team.
134-
- Place the license file provided by the Timecho team into the corresponding `activation` folder for each node.
135-
136-
#### Option 2: Command-Based Activation
129+
#### Option 1: Command-Based Activation
137130

138131
1. Enter the IoTDB CLI.
139132
- **For Table Model**:
@@ -145,14 +138,6 @@ Navigate to the `sbin` directory of IoTDB and start the DataNode:
145138
./start-cli.bat -sql_dialect table
146139
```
147140

148-
- **For Tree Model**:
149-
- ```SQL
150-
# For Linux or macOS
151-
./start-cli.sh
152-
153-
# For Windows
154-
./start-cli.bat
155-
```
156141
2. Run the following command to retrieve the machine code required for activation:
157142

158143
```Bash
@@ -177,6 +162,15 @@ It costs 0.030s
177162
IoTDB> activate '01-D4EYQGPZ-EAUJJODW-NUKRDR6F-TUQS3B75-EDZFLK3A-6BOKJFFZ-ALDHOMN7-NB2E4BHI-7ZKGFVK6-GCIFXA4T-UG3XJTTD-SHJV6F2P-Q27B4OMJ-R47ZDIM3-UUASUXG2-OQXGVZCO-MMYKICZU-TWFQYYAO-ZOAGOKJA-NYHQTA5U-EWAR4EP5-MRC6R2CI-PKUTKRCT-7UDGRH3F-7BYV4P5D-6KKIA==='
178163
```
179164
165+
166+
#### Option 2: File-Based Activation
167+
168+
- Start both the ConfigNode and DataNode.
169+
- Navigate to the `activation` folder and copy the `system_info` file.
170+
- Send the `system_info` file to the Timecho team.
171+
- Place the license file provided by the Timecho team into the corresponding `activation` folder for each node.
172+
173+
180174
### 2.6 Verify Activation
181175
182176
Check the `ClusterActivationStatus` field. If it shows `ACTIVATED`, the database has been successfully activated.

src/UserGuide/Master/Tree/Deployment-and-Maintenance/Cluster-Deployment_timecho.md

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -161,26 +161,10 @@ cd sbin
161161

162162
### 3.6 Activate Database
163163

164-
#### Option 1: File-Based Activation
165-
166-
1. Start all ConfigNodes and DataNodes.
167-
2. Copy the `system_info` file from the `activation` directory on each server and send them to the Timecho team.
168-
3. Place the license files provided by the Timecho team into the corresponding `activation` folder for each node.
169-
170-
#### Option 2: Command-Based Activation
164+
#### Option 1: Command-Based Activation
171165

172166
1. Enter the IoTDB CLI on any node of the cluster:
173167

174-
- **For Table Model**:
175-
176-
```SQL
177-
# For Linux or macOS
178-
./start-cli.sh -sql_dialect table
179-
180-
# For Windows
181-
./start-cli.bat -sql_dialect table
182-
```
183-
184168
- **For Tree Model**:
185169

186170
```SQL
@@ -197,7 +181,7 @@ cd sbin
197181
show system info
198182
```
199183

200-
3. Copy the returned machine codes of all 3 nodes in the cluster (displayed as a green string) and send it to the Timecho team:
184+
3. Copy the returned machine codes of all nodes in the cluster (displayed as a green string) and send it to the Timecho team:
201185

202186
```Bash
203187
+--------------------------------------------------------------+
@@ -215,6 +199,14 @@ cd sbin
215199
IoTDB> activate '01-D4EYQGPZ-EAUJJODW-NUKRDR6F-TUQS3B75-EDZFLK3A-6BOKJFFZ-ALDHOMN7-NB2E4BHI-7ZKGFVK6-GCIFXA4T-UG3XJTTD-SHJV6F2P-Q27B4OMJ-R47ZDIM3-UUASUXG2-OQXGVZCO-MMYKICZU-TWFQYYAO-ZOAGOKJA-NYHQTA5U-EWAR4EP5-MRC6R2CI-PKUTKRCT-7UDGRH3F-7BYV4P5D-6KKIA===,01-D4EYQGPZ-EAUJJODW-NUKRDR6F-TUQS3B75-EDZFLK3A-6BOKJFFZ-ALDHOMN7-NB2E4BHI-7ZKGFVK6-GCIFXA4T-UG3XJTTD-SHJV6F2P-Q27B4OMJ-R47ZDIM3-UUASUXG2-OQXGVZCO-MMYKICZU-TWFQYYAO-ZOAGOKJA-NYHQTA5U-EWAR4EP5-MRC6R2CI-PKUTKRCT-7UDGRH3F-7BYV4P5D-6KKIA===,01-D4EYQGPZ-EAUJJODW-NUKRDR6F-TUQS3B75-EDZFLK3A-6BOKJFFZ-ALDHOMN7-NB2E4BHI-7ZKGFVK6-GCIFXA4T-UG3XJTTD-SHJV6F2P-Q27B4OMJ-R47ZDIM3-UUASUXG2-OQXGVZCO-MMYKICZU-TWFQYYAO-ZOAGOKJA-NYHQTA5U-EWAR4EP5-MRC6R2CI-PKUTKRCT-7UDGRH3F-7BYV4P5D-6KKIA==='
216200
```
217201
202+
203+
#### Option 2: File-Based Activation
204+
205+
1. Start all ConfigNodes and DataNodes.
206+
2. Copy the `system_info` file from the `activation` directory on each server and send them to the Timecho team.
207+
3. Place the license files provided by the Timecho team into the corresponding `activation` folder for each node.
208+
209+
218210
### 3.7 Verify Activation
219211
220212
Check the `ClusterActivationStatus` field. If it shows `ACTIVATED`, the database has been successfully activated.

src/UserGuide/Master/Tree/Deployment-and-Maintenance/Stand-Alone-Deployment_timecho.md

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -124,27 +124,10 @@ Navigate to the `sbin` directory of IoTDB and start the DataNode:
124124

125125
### 2.5 Activate Database
126126

127-
#### Option 1: File-Based Activation
128-
129-
1. Start both the ConfigNode and DataNode.
130-
2. Navigate to the `activation` folder and copy the `system_info` file.
131-
3. Send the `system_info` file to the Timecho team.
132-
4. Place the license file provided by the Timecho team into the corresponding `activation` folder for each node.
133-
134-
#### Option 2: Command-Based Activation
127+
#### Option 1: Command-Based Activation
135128

136129
1. Enter the IoTDB CLI.
137130

138-
- **For Table Model**:
139-
140-
```SQL
141-
# For Linux or macOS
142-
./start-cli.sh -sql_dialect table
143-
144-
# For Windows
145-
./start-cli.bat -sql_dialect table
146-
```
147-
148131
- **For Tree Model**:
149132

150133
```SQL
@@ -179,6 +162,15 @@ It costs 0.030s
179162
IoTDB> activate '01-D4EYQGPZ-EAUJJODW-NUKRDR6F-TUQS3B75-EDZFLK3A-6BOKJFFZ-ALDHOMN7-NB2E4BHI-7ZKGFVK6-GCIFXA4T-UG3XJTTD-SHJV6F2P-Q27B4OMJ-R47ZDIM3-UUASUXG2-OQXGVZCO-MMYKICZU-TWFQYYAO-ZOAGOKJA-NYHQTA5U-EWAR4EP5-MRC6R2CI-PKUTKRCT-7UDGRH3F-7BYV4P5D-6KKIA==='
180163
```
181164

165+
166+
#### Option 2: File-Based Activation
167+
168+
1. Start both the ConfigNode and DataNode.
169+
2. Navigate to the `activation` folder and copy the `system_info` file.
170+
3. Send the `system_info` file to the Timecho team.
171+
4. Place the license file provided by the Timecho team into the corresponding `activation` folder for each node.
172+
173+
182174
### 2.6 Verify Activation
183175

184176
Check the `ClusterActivationStatus` field. If it shows `ACTIVATED`, the database has been successfully activated.

src/UserGuide/V1.3.x/Deployment-and-Maintenance/Cluster-Deployment_timecho.md

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -147,41 +147,7 @@ If the startup fails, please refer to [Common Questions](#common-questions).
147147

148148
### Activate Database
149149

150-
#### Method 1: Activate file copy activation
151-
152-
- After starting three confignode nodes in sequence, copy the `activation` folder of each machine and the `system_info` file of each machine to the Timecho staff;
153-
- The staff will return the license files for each ConfigNode node, where 3 license files will be returned;
154-
- Put the three license files into the `activation` folder of the corresponding ConfigNode node;
155-
156-
#### Method 2: Activate Script Activation
157-
158-
- Obtain the machine codes of three machines in sequence, enter the `sbin` directory of the installation directory, and execute the activation script `start activate.sh`:
159-
160-
```Bash
161-
cd sbin
162-
./start-activate.sh
163-
```
164-
165-
- The following information is displayed, where the machine code of one machine is displayed:
166-
167-
```Bash
168-
Please copy the system_info's content and send it to Timecho:
169-
01-KU5LDFFN-PNBEHDRH
170-
Please enter license:
171-
```
172-
173-
- The other two nodes execute the activation script `start activate.sh` in sequence, and then copy the machine codes of the three machines obtained to the Timecho staff
174-
- The staff will return 3 activation codes, which normally correspond to the order of the provided 3 machine codes. Please paste each activation code into the previous command line prompt `Please enter license:`, as shown below:
175-
176-
```Bash
177-
Please enter license:
178-
Jw+MmF+Atxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx5bAOXNeob5l+HO5fEMgzrW8OJPh26Vl6ljKUpCvpTiw==
179-
License has been stored to sbin/../activation/license
180-
Import completed. Please start cluster and excute 'show cluster' to verify activation status
181-
```
182-
183-
184-
#### Method 3: Activation via CLI (Version 1.3.4)
150+
#### Method 1: Activation via CLI (Version 1.3.4)
185151

186152
- First start the Datanode nodes, then enter the CLI of any node in the cluster
187153

@@ -190,15 +156,15 @@ If the startup fails, please refer to [Common Questions](#common-questions).
190156
./sbin/start-cli.sh
191157
```
192158

193-
- Obtain the machine codes of all 3 machines:
159+
- Obtain the machine codes of all nodes:
194160

195161
- Execute the following command to get the machine codes required for activation:
196162

197163
```Bash
198164
show system info
199165
```
200166

201-
- The following information will be displayed (machine codes of all 3 nodes in the cluster):
167+
- The machine codes of all nodes in the cluster will be displayed:
202168

203169
```Bash
204170
+--------------------------------------------------------------+
@@ -210,9 +176,9 @@ If the startup fails, please refer to [Common Questions](#common-questions).
210176
It costs 0.030s
211177
```
212178

213-
- Copy the obtained machine codes from all 3 machines and provide them to the Timecho team
179+
- Copy the obtained machine codes and provide them to the Timecho team
214180

215-
- The Timecho team will return an activation code, which normally corresponds to the order of the 3 provided machine codes. Paste the complete activation code into the CLI for activation
181+
- The Timecho team will return an activation code, which normally corresponds to the order of the provided machine codes. Paste the complete activation code into the CLI for activation
216182

217183
- Note: The activation code must be enclosed in ' symbols, as shown below:
218184
@@ -221,6 +187,42 @@ If the startup fails, please refer to [Common Questions](#common-questions).
221187
```
222188
223189
190+
#### Method 2: Activate file copy activation
191+
192+
- After starting three confignode nodes in sequence, copy the `activation` folder of each machine and the `system_info` file of each machine to the Timecho staff;
193+
- The staff will return the license files for each ConfigNode node, where 3 license files will be returned;
194+
- Put the three license files into the `activation` folder of the corresponding ConfigNode node;
195+
196+
#### Method 3: Activate Script Activation
197+
198+
- Obtain the machine codes of three machines in sequence, enter the `sbin` directory of the installation directory, and execute the activation script `start activate.sh`:
199+
200+
```Bash
201+
cd sbin
202+
./start-activate.sh
203+
```
204+
205+
- The following information is displayed, where the machine code of one machine is displayed:
206+
207+
```Bash
208+
Please copy the system_info's content and send it to Timecho:
209+
01-KU5LDFFN-PNBEHDRH
210+
Please enter license:
211+
```
212+
213+
- The other two nodes execute the activation script `start activate.sh` in sequence, and then copy the machine codes of the three machines obtained to the Timecho staff
214+
- The staff will return 3 activation codes, which normally correspond to the order of the provided 3 machine codes. Please paste each activation code into the previous command line prompt `Please enter license:`, as shown below:
215+
216+
```Bash
217+
Please enter license:
218+
Jw+MmF+Atxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx5bAOXNeob5l+HO5fEMgzrW8OJPh26Vl6ljKUpCvpTiw==
219+
License has been stored to sbin/../activation/license
220+
Import completed. Please start cluster and excute 'show cluster' to verify activation status
221+
```
222+
223+
224+
225+
224226
### Start DataNode
225227

226228
Enter the `sbin` directory of iotdb and start three datanode nodes in sequence:

src/UserGuide/V1.3.x/Deployment-and-Maintenance/Stand-Alone-Deployment_timecho.md

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -118,39 +118,7 @@ If the startup fails, please refer to [Common Questions](#common-questions).
118118

119119
### 4、Activate Database
120120

121-
#### Method 1: Activate file copy activation
122-
123-
- After starting the confignode node, enter the activation folder and copy the systeminfo file to the Timecho staff
124-
- Received the license file returned by the staff
125-
- Place the license file in the activation folder of the corresponding node;
126-
127-
#### Method 2: Activate Script Activation
128-
129-
- Obtain the required machine code for activation, enter the sbin directory of the installation directory, and execute the activation script:
130-
131-
```shell
132-
cd sbin
133-
./start-activate.sh
134-
```
135-
136-
- The following information is displayed. Please copy the machine code (i.e. the string of characters) to the Timecho staff:
137-
138-
```shell
139-
Please copy the system_info's content and send it to Timecho:
140-
01-KU5LDFFN-PNBEHDRH
141-
Please enter license:
142-
```
143-
144-
- Enter the activation code returned by the staff into the previous command line prompt 'Please enter license:', as shown below:
145-
146-
```shell
147-
Please enter license:
148-
JJw+MmF+AtexsfgNGOFgTm83Bxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxm6pF+APW1CiXLTSijK9Qh3nsLgzrW8OJPh26Vl6ljKUpCvpTiw==
149-
License has been stored to sbin/../activation/license
150-
Import completed. Please start cluster and excute 'show cluster' to verify activation status
151-
```
152-
153-
#### Method 3: Activation via CLI (Version 1.3.4)
121+
#### Method 1: Activation via CLI (Version 1.3.4)
154122

155123
- First start the Datanode, then enter the CLI
156124

@@ -185,6 +153,40 @@ IoTDB> activate '01-D4EYQGPZ-EAUJJODW-NUKRDR6F-TUQS3B75-EDZFLK3A-6BOKJFFZ-ALDHOM
185153
```
186154

187155

156+
#### Method 2: Activate file copy activation
157+
158+
- After starting the confignode node, enter the activation folder and copy the systeminfo file to the Timecho staff
159+
- Received the license file returned by the staff
160+
- Place the license file in the activation folder of the corresponding node;
161+
162+
#### Method 3: Activate Script Activation
163+
164+
- Obtain the required machine code for activation, enter the sbin directory of the installation directory, and execute the activation script:
165+
166+
```shell
167+
cd sbin
168+
./start-activate.sh
169+
```
170+
171+
- The following information is displayed. Please copy the machine code (i.e. the string of characters) to the Timecho staff:
172+
173+
```shell
174+
Please copy the system_info's content and send it to Timecho:
175+
01-KU5LDFFN-PNBEHDRH
176+
Please enter license:
177+
```
178+
179+
- Enter the activation code returned by the staff into the previous command line prompt 'Please enter license:', as shown below:
180+
181+
```shell
182+
Please enter license:
183+
JJw+MmF+AtexsfgNGOFgTm83Bxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxm6pF+APW1CiXLTSijK9Qh3nsLgzrW8OJPh26Vl6ljKUpCvpTiw==
184+
License has been stored to sbin/../activation/license
185+
Import completed. Please start cluster and excute 'show cluster' to verify activation status
186+
```
187+
188+
189+
188190
### 5、Start DataNode
189191
190192
Enter the sbin directory of iotdb and start datanode:

0 commit comments

Comments
 (0)