Skip to content

Commit dc0f11b

Browse files
authored
Merge branch 'develop' into develop
2 parents 9e9cd89 + c0b13a5 commit dc0f11b

File tree

89 files changed

+8490
-1382
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+8490
-1382
lines changed

README.md

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,26 @@ Monitor the health and performance of your TRON nodes with integrated **Promethe
1616
### 🛠️ Tools
1717
We also provide tools to facilitate the CI and testing process:
1818
- **Gradle Docker**: Automate the build and testing of the `java-tron` Docker image using Gradle.
19-
- **DBFork**: Launch a private java-tron network based on the Mainnet database state, enabling shadow fork testing.
19+
- **Toolkit**: This package contains a set of database tools for TRON:
20+
- `mv, move`: Move db to pre-set new path. For example HDD,reduce storage
21+
expenses.
22+
- `archive`: A helper to rewrite leveldb manifest.
23+
- `convert`: Covert leveldb to rocksdb.
24+
- `lite`: Split lite data for java-tron.
25+
- `cp, copy`: Quick copy leveldb or rocksdb data.
26+
- `root`: compute merkle root for tiny db. NOTE: large db may GC overhead
27+
limit exceeded.
28+
- `fork`: Modify the database of java-tron for shadow fork testing.
29+
- **Stress Test**: Execute the stress test and evaluate the performance of the `java-tron` fullnode.
30+
2031

2132
## Prerequisites
2233
Please ensure you have the latest versions of Docker and Docker Compose installed by downloading them from the official websites:
2334

2435
- **For Mac:**
2536
Download Docker from [Docker Desktop for Mac](https://docs.docker.com/docker-for-mac/install/).
26-
27-
*Note: Docker Compose is included in the Docker installation package for Mac.*
28-
37+
Docker Compose is included in the Docker installation package for Mac.
38+
- After installation, open Docker application, navigate to Settings \-> Resources \-> Network, and check the option \`Use kernel networking for UDP\`. Then restart Docker to apply.
2939

3040
- **For Linux:**
3141
Download and install both Docker and Docker Compose plugin from the official websites:
@@ -124,7 +134,8 @@ To start all available features, or you want more customized operations, navigat
124134

125135
- **Tools**:
126136
- **Gradle Docker**: Automate Docker image builds and testing. Check the [gradle docker](./tools/docker/README.md) documentation.
127-
- **DBFork**: Perform shadow fork testing. Follow the [DBFork guidance](./tools/dbfork/README.md).
137+
- **Toolkit**: Perform a set of database related operations. Follow the [Toolkit guidance](./tools/toolkit/README.md).
138+
- **Stress Test**: Execute the stress test. Follow the [stress test guidance](./tools/stress_test/README.md).
128139

129140
## Troubleshooting
130141
If you encounter any difficulties, please refer to the [Issue Work Flow](https://tronprotocol.github.io/documentation-en/developers/issue-workflow/#issue-work-flow), then raise an issue on [GitHub](https://github.com/tronprotocol/tron-docker/issues). For general questions, please use [Discord](https://discord.gg/cGKSsRVCGm) or [Telegram](https://t.me/TronOfficialDevelopersGroupEn).

single_node/README.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,15 @@ If the following error cases do not cover your issue, please refer to [Issue Wor
170170
If the logs show `Peer stats: all 0, active 0, passive 0`, it means tron node cannot use **P2P Node Discovering Protocol** to find neighbors.
171171
This protocol operates over UDP through port 18888. Therefore, the most likely cause of this issue is a network problem.
172172
Try debugging with the following steps:
173-
- Use the command `docker ps` to check if the ports mapping includes `-p 18888:18888`.
173+
- Use the command `docker ps` to check if the port mapping includes `-p 18888:18888`.
174174
- Verify your local network settings to ensure that port 18888 is not blocked.
175-
- Open the Docker application, navigate to Settings -> Resources -> Network, and check the option 'Use kernel networking for UDP'. Then restart Docker and your container.
175+
- If you are using a cloud server, check the security group settings to ensure that port 18888 is open.
176+
- If you are using macOS, open the Docker application, navigate to Settings \-> Resources \-> Network, and check the option \`Use kernel networking for UDP\`. Then restart Docker and your container.
177+
- If you are using Linux, you may need to enable IP forwarding:
178+
- Add \`net.ipv4.ip_forward=1\` to file \`/etc/sysctl.conf\`
179+
- Then restarted the network service and validated the setting:
180+
```
181+
[root@demo]# systemctl restart network
182+
[root@demo]# sysctl net.ipv4.ip_forward
183+
net. ipv4. ip_forward = 1 // expected output
184+
```

0 commit comments

Comments
 (0)