mirror of
https://github.com/apache/rocketmq-dashboard.git
synced 2026-02-21 04:45:41 +08:00
Compare commits
7 Commits
optimze_qu
...
a4fecf8327
| Author | SHA1 | Date | |
|---|---|---|---|
|
a4fecf8327 | ||
|
2fb0fce0b1 | ||
|
6456630324 | ||
|
|
a25ccd6337 | ||
|
|
538d1c1c45 | ||
|
|
94dda468f9 | ||
|
86bdb06364 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -5,3 +5,4 @@
|
|||||||
.project
|
.project
|
||||||
.factorypath
|
.factorypath
|
||||||
.settings/
|
.settings/
|
||||||
|
.vscode
|
||||||
171
frontend/package-lock.json
generated
171
frontend/package-lock.json
generated
@@ -3577,6 +3577,11 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"base16": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/base16/-/base16-1.0.0.tgz",
|
||||||
|
"integrity": "sha512-pNdYkNPiJUnEhnfXV56+sQy8+AaPcG3POZAUnwr4EeqCUZFz4u2PePbo3e5Gj4ziYPCWGUZT9RHisvJKnwFuBQ=="
|
||||||
|
},
|
||||||
"base64-js": {
|
"base64-js": {
|
||||||
"version": "1.5.1",
|
"version": "1.5.1",
|
||||||
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
|
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
|
||||||
@@ -4474,6 +4479,14 @@
|
|||||||
"sha.js": "2.4.11"
|
"sha.js": "2.4.11"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"cross-fetch": {
|
||||||
|
"version": "3.1.5",
|
||||||
|
"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.1.5.tgz",
|
||||||
|
"integrity": "sha512-lvb1SBsI0Z7GDwmuid+mU3kWVBwTVUbe7S0H52yaaAdQOXq2YktTCZdlAcNKFzE6QtRz0snpw9bNiPeOIkkQvw==",
|
||||||
|
"requires": {
|
||||||
|
"node-fetch": "2.6.7"
|
||||||
|
}
|
||||||
|
},
|
||||||
"cross-spawn": {
|
"cross-spawn": {
|
||||||
"version": "6.0.5",
|
"version": "6.0.5",
|
||||||
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
|
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
|
||||||
@@ -6438,6 +6451,43 @@
|
|||||||
"bser": "2.1.1"
|
"bser": "2.1.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"fbemitter": {
|
||||||
|
"version": "3.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-3.0.0.tgz",
|
||||||
|
"integrity": "sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==",
|
||||||
|
"requires": {
|
||||||
|
"fbjs": "^3.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"fbjs": {
|
||||||
|
"version": "3.0.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.4.tgz",
|
||||||
|
"integrity": "sha512-ucV0tDODnGV3JCnnkmoszb5lf4bNpzjv80K41wd4k798Etq+UYD0y0TIfalLjZoKgjive6/adkRnszwapiDgBQ==",
|
||||||
|
"requires": {
|
||||||
|
"cross-fetch": "^3.1.5",
|
||||||
|
"fbjs-css-vars": "^1.0.0",
|
||||||
|
"loose-envify": "^1.0.0",
|
||||||
|
"object-assign": "^4.1.0",
|
||||||
|
"promise": "^7.1.1",
|
||||||
|
"setimmediate": "^1.0.5",
|
||||||
|
"ua-parser-js": "^0.7.30"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"promise": {
|
||||||
|
"version": "7.3.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
|
||||||
|
"integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
|
||||||
|
"requires": {
|
||||||
|
"asap": "~2.0.3"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"fbjs-css-vars": {
|
||||||
|
"version": "1.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz",
|
||||||
|
"integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ=="
|
||||||
|
},
|
||||||
"figgy-pudding": {
|
"figgy-pudding": {
|
||||||
"version": "3.5.2",
|
"version": "3.5.2",
|
||||||
"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
|
"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
|
||||||
@@ -6567,6 +6617,15 @@
|
|||||||
"readable-stream": "2.3.7"
|
"readable-stream": "2.3.7"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flux": {
|
||||||
|
"version": "4.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/flux/-/flux-4.0.3.tgz",
|
||||||
|
"integrity": "sha512-yKAbrp7JhZhj6uiT1FTuVMlIAT1J4jqEyBpFApi1kxpGZCvacMVc/t1pMQyotqHhAgvoE3bNvAykhCo2CLjnYw==",
|
||||||
|
"requires": {
|
||||||
|
"fbemitter": "^3.0.0",
|
||||||
|
"fbjs": "^3.0.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
"follow-redirects": {
|
"follow-redirects": {
|
||||||
"version": "1.14.2",
|
"version": "1.14.2",
|
||||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
|
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
|
||||||
@@ -9787,11 +9846,21 @@
|
|||||||
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
|
"resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz",
|
||||||
"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
|
"integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8="
|
||||||
},
|
},
|
||||||
|
"lodash.curry": {
|
||||||
|
"version": "4.1.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/lodash.curry/-/lodash.curry-4.1.1.tgz",
|
||||||
|
"integrity": "sha512-/u14pXGviLaweY5JI0IUzgzF2J6Ne8INyzAZjImcryjgkZ+ebruBxy2/JaOOkTqScddcYtakjhSaeemV8lR0tA=="
|
||||||
|
},
|
||||||
"lodash.debounce": {
|
"lodash.debounce": {
|
||||||
"version": "4.0.8",
|
"version": "4.0.8",
|
||||||
"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
|
"resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
|
||||||
"integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
|
"integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168="
|
||||||
},
|
},
|
||||||
|
"lodash.flow": {
|
||||||
|
"version": "3.5.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/lodash.flow/-/lodash.flow-3.5.0.tgz",
|
||||||
|
"integrity": "sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw=="
|
||||||
|
},
|
||||||
"lodash.memoize": {
|
"lodash.memoize": {
|
||||||
"version": "4.1.2",
|
"version": "4.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
|
||||||
@@ -10291,6 +10360,35 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node-fetch": {
|
||||||
|
"version": "2.6.7",
|
||||||
|
"resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz",
|
||||||
|
"integrity": "sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==",
|
||||||
|
"requires": {
|
||||||
|
"whatwg-url": "^5.0.0"
|
||||||
|
},
|
||||||
|
"dependencies": {
|
||||||
|
"tr46": {
|
||||||
|
"version": "0.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
|
||||||
|
"integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
|
||||||
|
},
|
||||||
|
"webidl-conversions": {
|
||||||
|
"version": "3.0.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
|
||||||
|
"integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ=="
|
||||||
|
},
|
||||||
|
"whatwg-url": {
|
||||||
|
"version": "5.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
|
||||||
|
"integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
|
||||||
|
"requires": {
|
||||||
|
"tr46": "~0.0.3",
|
||||||
|
"webidl-conversions": "^3.0.0"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
"node-forge": {
|
"node-forge": {
|
||||||
"version": "0.10.0",
|
"version": "0.10.0",
|
||||||
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
|
"resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
|
||||||
@@ -12209,6 +12307,11 @@
|
|||||||
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz",
|
||||||
"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
|
"integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="
|
||||||
},
|
},
|
||||||
|
"pure-color": {
|
||||||
|
"version": "1.3.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/pure-color/-/pure-color-1.3.0.tgz",
|
||||||
|
"integrity": "sha512-QFADYnsVoBMw1srW7OVKEYjG+MbIa49s54w1MA1EDY6r2r/sTcKKYqRX1f4GYvnXP7eN/Pe9HFcX+hwzmrXRHA=="
|
||||||
|
},
|
||||||
"q": {
|
"q": {
|
||||||
"version": "1.5.1",
|
"version": "1.5.1",
|
||||||
"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
|
"resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz",
|
||||||
@@ -12318,6 +12421,17 @@
|
|||||||
"whatwg-fetch": "3.6.2"
|
"whatwg-fetch": "3.6.2"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"react-base16-styling": {
|
||||||
|
"version": "0.6.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/react-base16-styling/-/react-base16-styling-0.6.0.tgz",
|
||||||
|
"integrity": "sha512-yvh/7CArceR/jNATXOKDlvTnPKPmGZz7zsenQ3jUwLzHkNUR0CvY3yGYJbWJ/nnxsL8Sgmt5cO3/SILVuPO6TQ==",
|
||||||
|
"requires": {
|
||||||
|
"base16": "^1.0.0",
|
||||||
|
"lodash.curry": "^4.0.1",
|
||||||
|
"lodash.flow": "^3.3.0",
|
||||||
|
"pure-color": "^1.2.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"react-dev-utils": {
|
"react-dev-utils": {
|
||||||
"version": "11.0.4",
|
"version": "11.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/react-dev-utils/-/react-dev-utils-11.0.4.tgz",
|
||||||
@@ -12535,6 +12649,22 @@
|
|||||||
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
|
||||||
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
|
"integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="
|
||||||
},
|
},
|
||||||
|
"react-json-view": {
|
||||||
|
"version": "1.21.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/react-json-view/-/react-json-view-1.21.3.tgz",
|
||||||
|
"integrity": "sha512-13p8IREj9/x/Ye4WI/JpjhoIwuzEgUAtgJZNBJckfzJt1qyh24BdTm6UQNGnyTq9dapQdrqvquZTo3dz1X6Cjw==",
|
||||||
|
"requires": {
|
||||||
|
"flux": "^4.0.1",
|
||||||
|
"react-base16-styling": "^0.6.0",
|
||||||
|
"react-lifecycles-compat": "^3.0.4",
|
||||||
|
"react-textarea-autosize": "^8.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"react-lifecycles-compat": {
|
||||||
|
"version": "3.0.4",
|
||||||
|
"resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz",
|
||||||
|
"integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="
|
||||||
|
},
|
||||||
"react-refresh": {
|
"react-refresh": {
|
||||||
"version": "0.8.3",
|
"version": "0.8.3",
|
||||||
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
|
"resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.8.3.tgz",
|
||||||
@@ -12606,6 +12736,16 @@
|
|||||||
"workbox-webpack-plugin": "5.1.4"
|
"workbox-webpack-plugin": "5.1.4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"react-textarea-autosize": {
|
||||||
|
"version": "8.4.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.4.0.tgz",
|
||||||
|
"integrity": "sha512-YrTFaEHLgJsi8sJVYHBzYn+mkP3prGkmP2DKb/tm0t7CLJY5t1Rxix8070LAKb0wby7bl/lf2EeHkuMihMZMwQ==",
|
||||||
|
"requires": {
|
||||||
|
"@babel/runtime": "^7.10.2",
|
||||||
|
"use-composed-ref": "^1.3.0",
|
||||||
|
"use-latest": "^1.2.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
"read-pkg": {
|
"read-pkg": {
|
||||||
"version": "3.0.0",
|
"version": "3.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
|
||||||
@@ -14709,6 +14849,11 @@
|
|||||||
"is-typedarray": "1.0.0"
|
"is-typedarray": "1.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"ua-parser-js": {
|
||||||
|
"version": "0.7.34",
|
||||||
|
"resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.34.tgz",
|
||||||
|
"integrity": "sha512-cJMeh/eOILyGu0ejgTKB95yKT3zOenSe9UGE3vj6WfiOwgGYnmATUsnDixMFvdU+rNMvWih83hrUP8VwhF9yXQ=="
|
||||||
|
},
|
||||||
"unbox-primitive": {
|
"unbox-primitive": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.1.tgz",
|
||||||
@@ -14915,6 +15060,24 @@
|
|||||||
"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
|
||||||
"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
|
"integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ=="
|
||||||
},
|
},
|
||||||
|
"use-composed-ref": {
|
||||||
|
"version": "1.3.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.3.0.tgz",
|
||||||
|
"integrity": "sha512-GLMG0Jc/jiKov/3Ulid1wbv3r54K9HlMW29IWcDFPEqFkSO2nS0MuefWgMJpeHQ9YJeXDL3ZUF+P3jdXlZX/cQ=="
|
||||||
|
},
|
||||||
|
"use-isomorphic-layout-effect": {
|
||||||
|
"version": "1.1.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz",
|
||||||
|
"integrity": "sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA=="
|
||||||
|
},
|
||||||
|
"use-latest": {
|
||||||
|
"version": "1.2.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.2.1.tgz",
|
||||||
|
"integrity": "sha512-xA+AVm/Wlg3e2P/JiItTziwS7FK92LWrDB0p+hgXloIMuVCeJJ8v6f0eeHyPZaJrM+usM1FkFfbNCrJGs8A/zw==",
|
||||||
|
"requires": {
|
||||||
|
"use-isomorphic-layout-effect": "^1.1.1"
|
||||||
|
}
|
||||||
|
},
|
||||||
"util": {
|
"util": {
|
||||||
"version": "0.11.1",
|
"version": "0.11.1",
|
||||||
"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
|
"resolved": "https://registry.npmjs.org/util/-/util-0.11.1.tgz",
|
||||||
@@ -15083,6 +15246,7 @@
|
|||||||
"version": "2.3.2",
|
"version": "2.3.2",
|
||||||
"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
|
||||||
"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
|
"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"arr-flatten": "1.1.0",
|
"arr-flatten": "1.1.0",
|
||||||
"array-unique": "0.3.2",
|
"array-unique": "0.3.2",
|
||||||
@@ -15100,6 +15264,7 @@
|
|||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
|
||||||
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
|
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"is-extendable": "0.1.1"
|
"is-extendable": "0.1.1"
|
||||||
}
|
}
|
||||||
@@ -15130,6 +15295,7 @@
|
|||||||
"version": "4.0.0",
|
"version": "4.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
|
||||||
"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
|
"integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"extend-shallow": "2.0.1",
|
"extend-shallow": "2.0.1",
|
||||||
"is-number": "3.0.0",
|
"is-number": "3.0.0",
|
||||||
@@ -15141,6 +15307,7 @@
|
|||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
|
||||||
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
|
"integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"is-extendable": "0.1.1"
|
"is-extendable": "0.1.1"
|
||||||
}
|
}
|
||||||
@@ -15191,6 +15358,7 @@
|
|||||||
"version": "3.0.0",
|
"version": "3.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
|
||||||
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
|
"integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"kind-of": "3.2.2"
|
"kind-of": "3.2.2"
|
||||||
},
|
},
|
||||||
@@ -15199,6 +15367,7 @@
|
|||||||
"version": "3.2.2",
|
"version": "3.2.2",
|
||||||
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
|
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
|
||||||
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
|
"integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"is-buffer": "1.1.6"
|
"is-buffer": "1.1.6"
|
||||||
}
|
}
|
||||||
@@ -15209,6 +15378,7 @@
|
|||||||
"version": "3.1.10",
|
"version": "3.1.10",
|
||||||
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
|
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
|
||||||
"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
|
"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"arr-diff": "4.0.0",
|
"arr-diff": "4.0.0",
|
||||||
"array-unique": "0.3.2",
|
"array-unique": "0.3.2",
|
||||||
@@ -15240,6 +15410,7 @@
|
|||||||
"version": "2.1.1",
|
"version": "2.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
|
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
|
||||||
"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
|
"integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
|
||||||
|
"optional": true,
|
||||||
"requires": {
|
"requires": {
|
||||||
"is-number": "3.0.0",
|
"is-number": "3.0.0",
|
||||||
"repeat-string": "1.6.1"
|
"repeat-string": "1.6.1"
|
||||||
|
|||||||
@@ -7252,9 +7252,9 @@ minimatch@3.0.4, minimatch@^3.0.4:
|
|||||||
brace-expansion "^1.1.7"
|
brace-expansion "^1.1.7"
|
||||||
|
|
||||||
minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
|
minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5:
|
||||||
version "1.2.5"
|
version "1.2.8"
|
||||||
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"
|
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
|
||||||
integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==
|
integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
|
||||||
|
|
||||||
minipass-collect@^1.0.2:
|
minipass-collect@^1.0.2:
|
||||||
version "1.0.2"
|
version "1.0.2"
|
||||||
|
|||||||
4
pom.xml
4
pom.xml
@@ -91,10 +91,10 @@
|
|||||||
<commons-io.version>2.4</commons-io.version>
|
<commons-io.version>2.4</commons-io.version>
|
||||||
<commons-cli.version>1.2</commons-cli.version>
|
<commons-cli.version>1.2</commons-cli.version>
|
||||||
<commons-collections.version>3.2.2</commons-collections.version>
|
<commons-collections.version>3.2.2</commons-collections.version>
|
||||||
<rocketmq.version>4.9.3</rocketmq.version>
|
<rocketmq.version>5.1.0</rocketmq.version>
|
||||||
<surefire.version>2.19.1</surefire.version>
|
<surefire.version>2.19.1</surefire.version>
|
||||||
<aspectj.version>1.9.6</aspectj.version>
|
<aspectj.version>1.9.6</aspectj.version>
|
||||||
<lombok.version>1.18.12</lombok.version>
|
<lombok.version>1.18.22</lombok.version>
|
||||||
<main.basedir>${basedir}/../..</main.basedir>
|
<main.basedir>${basedir}/../..</main.basedir>
|
||||||
<docker.image.prefix>apacherocketmq</docker.image.prefix>
|
<docker.image.prefix>apacherocketmq</docker.image.prefix>
|
||||||
<spring.boot.version>2.6.0</spring.boot.version>
|
<spring.boot.version>2.6.0</spring.boot.version>
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import org.apache.commons.collections.MapUtils;
|
|||||||
import org.apache.commons.pool2.PooledObject;
|
import org.apache.commons.pool2.PooledObject;
|
||||||
import org.apache.commons.pool2.PooledObjectFactory;
|
import org.apache.commons.pool2.PooledObjectFactory;
|
||||||
import org.apache.commons.pool2.impl.DefaultPooledObject;
|
import org.apache.commons.pool2.impl.DefaultPooledObject;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
||||||
|
|
||||||
@Slf4j
|
@Slf4j
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ package org.apache.rocketmq.dashboard.controller;
|
|||||||
import com.google.common.base.Preconditions;
|
import com.google.common.base.Preconditions;
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import org.apache.commons.collections.CollectionUtils;
|
import org.apache.commons.collections.CollectionUtils;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
|
||||||
import org.apache.rocketmq.dashboard.model.ConnectionInfo;
|
import org.apache.rocketmq.dashboard.model.ConnectionInfo;
|
||||||
import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
|
import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
|
||||||
import org.apache.rocketmq.dashboard.model.request.DeleteSubGroupRequest;
|
import org.apache.rocketmq.dashboard.model.request.DeleteSubGroupRequest;
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ package org.apache.rocketmq.dashboard.controller;
|
|||||||
|
|
||||||
import com.google.common.collect.Maps;
|
import com.google.common.collect.Maps;
|
||||||
import org.apache.rocketmq.common.Pair;
|
import org.apache.rocketmq.common.Pair;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
|
||||||
import org.apache.rocketmq.dashboard.model.MessagePage;
|
import org.apache.rocketmq.dashboard.model.MessagePage;
|
||||||
import org.apache.rocketmq.dashboard.model.MessageView;
|
import org.apache.rocketmq.dashboard.model.MessageView;
|
||||||
import org.apache.rocketmq.dashboard.model.request.MessageQuery;
|
import org.apache.rocketmq.dashboard.model.request.MessageQuery;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
package org.apache.rocketmq.dashboard.controller;
|
package org.apache.rocketmq.dashboard.controller;
|
||||||
|
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import org.apache.rocketmq.common.protocol.body.ProducerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
|
||||||
import org.apache.rocketmq.dashboard.model.ConnectionInfo;
|
import org.apache.rocketmq.dashboard.model.ConnectionInfo;
|
||||||
import org.apache.rocketmq.dashboard.permisssion.Permission;
|
import org.apache.rocketmq.dashboard.permisssion.Permission;
|
||||||
import org.apache.rocketmq.dashboard.service.ProducerService;
|
import org.apache.rocketmq.dashboard.service.ProducerService;
|
||||||
|
|||||||
@@ -20,7 +20,7 @@ import com.google.common.collect.Sets;
|
|||||||
import java.util.Collection;
|
import java.util.Collection;
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import org.apache.rocketmq.common.MQVersion;
|
import org.apache.rocketmq.common.MQVersion;
|
||||||
import org.apache.rocketmq.common.protocol.body.Connection;
|
import org.apache.rocketmq.remoting.protocol.body.Connection;
|
||||||
|
|
||||||
public class ConnectionInfo extends Connection {
|
public class ConnectionInfo extends Connection {
|
||||||
private String versionDesc;
|
private String versionDesc;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.apache.rocketmq.dashboard.model;
|
package org.apache.rocketmq.dashboard.model;
|
||||||
|
|
||||||
import org.apache.rocketmq.common.admin.RollbackStats;
|
import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
|
||||||
import com.google.common.collect.Lists;
|
import com.google.common.collect.Lists;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|||||||
@@ -17,8 +17,8 @@
|
|||||||
package org.apache.rocketmq.dashboard.model;
|
package org.apache.rocketmq.dashboard.model;
|
||||||
|
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.apache.rocketmq.common.protocol.body.CMResult;
|
import org.apache.rocketmq.remoting.protocol.body.CMResult;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
|
||||||
|
|
||||||
@Data
|
@Data
|
||||||
public class DlqMessageResendResult {
|
public class DlqMessageResendResult {
|
||||||
|
|||||||
@@ -16,8 +16,8 @@
|
|||||||
*/
|
*/
|
||||||
package org.apache.rocketmq.dashboard.model;
|
package org.apache.rocketmq.dashboard.model;
|
||||||
|
|
||||||
import org.apache.rocketmq.common.protocol.heartbeat.ConsumeType;
|
import org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType;
|
||||||
import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
|
import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
|
||||||
|
|
||||||
public class GroupConsumeInfo implements Comparable<GroupConsumeInfo> {
|
public class GroupConsumeInfo implements Comparable<GroupConsumeInfo> {
|
||||||
private String group;
|
private String group;
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.apache.rocketmq.dashboard.model;
|
package org.apache.rocketmq.dashboard.model;
|
||||||
|
|
||||||
import org.apache.rocketmq.common.admin.OffsetWrapper;
|
import org.apache.rocketmq.remoting.protocol.admin.OffsetWrapper;
|
||||||
import org.apache.rocketmq.common.message.MessageQueue;
|
import org.apache.rocketmq.common.message.MessageQueue;
|
||||||
import org.springframework.beans.BeanUtils;
|
import org.springframework.beans.BeanUtils;
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
*/
|
*/
|
||||||
package org.apache.rocketmq.dashboard.model.request;
|
package org.apache.rocketmq.dashboard.model.request;
|
||||||
|
|
||||||
import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
|
import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,6 @@
|
|||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
*/
|
*/
|
||||||
package org.apache.rocketmq.dashboard.model.request;
|
package org.apache.rocketmq.dashboard.model.request;
|
||||||
|
|
||||||
import com.google.common.base.Objects;
|
import com.google.common.base.Objects;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ package org.apache.rocketmq.dashboard.service;
|
|||||||
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
||||||
import com.google.common.base.Throwables;
|
import com.google.common.base.Throwables;
|
||||||
import com.google.common.collect.Sets;
|
import com.google.common.collect.Sets;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import org.apache.commons.collections.CollectionUtils;
|
import org.apache.commons.collections.CollectionUtils;
|
||||||
@@ -28,7 +28,7 @@ import org.apache.commons.collections.CollectionUtils;
|
|||||||
public abstract class AbstractCommonService {
|
public abstract class AbstractCommonService {
|
||||||
@Resource
|
@Resource
|
||||||
protected MQAdminExt mqAdminExt;
|
protected MQAdminExt mqAdminExt;
|
||||||
protected final Set<String> changeToBrokerNameSet(HashMap<String, Set<String>> clusterAddrTable,
|
protected final Set<String> changeToBrokerNameSet(Map<String, Set<String>> clusterAddrTable,
|
||||||
List<String> clusterNameList, List<String> brokerNameList) {
|
List<String> clusterNameList, List<String> brokerNameList) {
|
||||||
Set<String> finalBrokerNameList = Sets.newHashSet();
|
Set<String> finalBrokerNameList = Sets.newHashSet();
|
||||||
if (CollectionUtils.isNotEmpty(clusterNameList)) {
|
if (CollectionUtils.isNotEmpty(clusterNameList)) {
|
||||||
@@ -38,7 +38,8 @@ public abstract class AbstractCommonService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (CollectionUtils.isNotEmpty(brokerNameList)) {
|
if (CollectionUtils.isNotEmpty(brokerNameList)) {
|
||||||
|
|||||||
@@ -17,8 +17,8 @@
|
|||||||
|
|
||||||
package org.apache.rocketmq.dashboard.service;
|
package org.apache.rocketmq.dashboard.service;
|
||||||
|
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
|
||||||
import org.apache.rocketmq.dashboard.model.ConsumerGroupRollBackStat;
|
import org.apache.rocketmq.dashboard.model.ConsumerGroupRollBackStat;
|
||||||
import org.apache.rocketmq.dashboard.model.GroupConsumeInfo;
|
import org.apache.rocketmq.dashboard.model.GroupConsumeInfo;
|
||||||
import org.apache.rocketmq.dashboard.model.TopicConsumerInfo;
|
import org.apache.rocketmq.dashboard.model.TopicConsumerInfo;
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ package org.apache.rocketmq.dashboard.service;
|
|||||||
|
|
||||||
import org.apache.rocketmq.common.Pair;
|
import org.apache.rocketmq.common.Pair;
|
||||||
import org.apache.rocketmq.common.message.MessageExt;
|
import org.apache.rocketmq.common.message.MessageExt;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
|
||||||
import org.apache.rocketmq.dashboard.model.MessagePage;
|
import org.apache.rocketmq.dashboard.model.MessagePage;
|
||||||
import org.apache.rocketmq.dashboard.model.request.MessageQuery;
|
import org.apache.rocketmq.dashboard.model.request.MessageQuery;
|
||||||
import org.apache.rocketmq.tools.admin.api.MessageTrack;
|
import org.apache.rocketmq.tools.admin.api.MessageTrack;
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
package org.apache.rocketmq.dashboard.service;
|
package org.apache.rocketmq.dashboard.service;
|
||||||
|
|
||||||
import org.apache.rocketmq.common.protocol.body.ProducerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
|
||||||
|
|
||||||
public interface ProducerService {
|
public interface ProducerService {
|
||||||
ProducerConnection getProducerConnection(String producerGroup, String topic);
|
ProducerConnection getProducerConnection(String producerGroup, String topic);
|
||||||
|
|||||||
@@ -19,10 +19,10 @@ package org.apache.rocketmq.dashboard.service;
|
|||||||
|
|
||||||
import org.apache.rocketmq.client.producer.SendResult;
|
import org.apache.rocketmq.client.producer.SendResult;
|
||||||
import org.apache.rocketmq.common.TopicConfig;
|
import org.apache.rocketmq.common.TopicConfig;
|
||||||
import org.apache.rocketmq.common.admin.TopicStatsTable;
|
import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
|
||||||
import org.apache.rocketmq.common.protocol.body.GroupList;
|
import org.apache.rocketmq.remoting.protocol.body.GroupList;
|
||||||
import org.apache.rocketmq.common.protocol.body.TopicList;
|
import org.apache.rocketmq.remoting.protocol.body.TopicList;
|
||||||
import org.apache.rocketmq.common.protocol.route.TopicRouteData;
|
import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
|
||||||
import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
|
import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
|
||||||
import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
|
import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
|
||||||
|
|
||||||
|
|||||||
@@ -29,31 +29,41 @@ import org.apache.rocketmq.client.impl.MQAdminImpl;
|
|||||||
import org.apache.rocketmq.common.AclConfig;
|
import org.apache.rocketmq.common.AclConfig;
|
||||||
import org.apache.rocketmq.common.PlainAccessConfig;
|
import org.apache.rocketmq.common.PlainAccessConfig;
|
||||||
import org.apache.rocketmq.common.TopicConfig;
|
import org.apache.rocketmq.common.TopicConfig;
|
||||||
import org.apache.rocketmq.common.admin.ConsumeStats;
|
import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
|
||||||
import org.apache.rocketmq.common.admin.RollbackStats;
|
import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
|
||||||
import org.apache.rocketmq.common.admin.TopicStatsTable;
|
import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
|
||||||
import org.apache.rocketmq.common.message.MessageClientIDSetter;
|
import org.apache.rocketmq.common.message.MessageClientIDSetter;
|
||||||
import org.apache.rocketmq.common.message.MessageExt;
|
import org.apache.rocketmq.common.message.MessageExt;
|
||||||
import org.apache.rocketmq.common.message.MessageQueue;
|
import org.apache.rocketmq.common.message.MessageQueue;
|
||||||
import org.apache.rocketmq.common.protocol.RequestCode;
|
import org.apache.rocketmq.common.message.MessageRequestMode;
|
||||||
import org.apache.rocketmq.common.protocol.ResponseCode;
|
import org.apache.rocketmq.remoting.protocol.RequestCode;
|
||||||
import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
|
import org.apache.rocketmq.remoting.protocol.ResponseCode;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterAclVersionInfo;
|
import org.apache.rocketmq.remoting.protocol.body.BrokerReplicasInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterAclVersionInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumeStatsList;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumeStatsList;
|
||||||
import org.apache.rocketmq.common.protocol.body.GroupList;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
|
||||||
import org.apache.rocketmq.common.protocol.body.KVTable;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.ProducerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.EpochEntryCache;
|
||||||
import org.apache.rocketmq.common.protocol.body.QueryConsumeQueueResponseBody;
|
import org.apache.rocketmq.remoting.protocol.body.GroupList;
|
||||||
import org.apache.rocketmq.common.protocol.body.QueueTimeSpan;
|
import org.apache.rocketmq.remoting.protocol.body.HARuntimeInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
|
import org.apache.rocketmq.remoting.protocol.body.KVTable;
|
||||||
import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper;
|
import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
|
||||||
import org.apache.rocketmq.common.protocol.body.TopicList;
|
import org.apache.rocketmq.remoting.protocol.body.ProducerTableInfo;
|
||||||
import org.apache.rocketmq.common.protocol.route.TopicRouteData;
|
import org.apache.rocketmq.remoting.protocol.body.QueryConsumeQueueResponseBody;
|
||||||
import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
|
import org.apache.rocketmq.remoting.protocol.body.QueueTimeSpan;
|
||||||
|
import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
|
||||||
|
import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper;
|
||||||
|
import org.apache.rocketmq.remoting.protocol.body.TopicList;
|
||||||
|
import org.apache.rocketmq.remoting.protocol.header.controller.ElectMasterResponseHeader;
|
||||||
|
import org.apache.rocketmq.remoting.protocol.header.controller.GetMetaDataResponseHeader;
|
||||||
|
import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
|
||||||
|
import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
|
||||||
|
import org.apache.rocketmq.remoting.protocol.statictopic.TopicQueueMappingDetail;
|
||||||
|
import org.apache.rocketmq.remoting.protocol.subscription.GroupForbidden;
|
||||||
|
import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
|
||||||
import org.apache.rocketmq.dashboard.util.JsonUtil;
|
import org.apache.rocketmq.dashboard.util.JsonUtil;
|
||||||
import org.apache.rocketmq.remoting.RemotingClient;
|
import org.apache.rocketmq.remoting.RemotingClient;
|
||||||
import org.apache.rocketmq.remoting.exception.RemotingCommandException;
|
import org.apache.rocketmq.remoting.exception.RemotingCommandException;
|
||||||
@@ -63,7 +73,9 @@ import org.apache.rocketmq.remoting.exception.RemotingSendRequestException;
|
|||||||
import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
|
import org.apache.rocketmq.remoting.exception.RemotingTimeoutException;
|
||||||
import org.apache.rocketmq.remoting.protocol.RemotingCommand;
|
import org.apache.rocketmq.remoting.protocol.RemotingCommand;
|
||||||
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
||||||
|
import org.apache.rocketmq.tools.admin.api.BrokerOperatorResult;
|
||||||
import org.apache.rocketmq.tools.admin.api.MessageTrack;
|
import org.apache.rocketmq.tools.admin.api.MessageTrack;
|
||||||
|
import org.apache.rocketmq.tools.admin.common.AdminToolResult;
|
||||||
import org.joor.Reflect;
|
import org.joor.Reflect;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
@@ -81,7 +93,7 @@ public class MQAdminExtImpl implements MQAdminExt {
|
|||||||
@Override
|
@Override
|
||||||
public void updateBrokerConfig(String brokerAddr, Properties properties)
|
public void updateBrokerConfig(String brokerAddr, Properties properties)
|
||||||
throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException,
|
throws RemotingConnectException, RemotingSendRequestException, RemotingTimeoutException,
|
||||||
UnsupportedEncodingException, InterruptedException, MQBrokerException {
|
UnsupportedEncodingException, InterruptedException, MQBrokerException, MQClientException {
|
||||||
MQAdminInstance.threadLocalMQAdminExt().updateBrokerConfig(brokerAddr, properties);
|
MQAdminInstance.threadLocalMQAdminExt().updateBrokerConfig(brokerAddr, properties);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -128,7 +140,7 @@ public class MQAdminExtImpl implements MQAdminExt {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public SubscriptionGroupConfig examineSubscriptionGroupConfig(String addr, String group) {
|
public SubscriptionGroupConfig examineSubscriptionGroupConfig(String addr, String group) throws MQBrokerException {
|
||||||
RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
|
RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
|
||||||
RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_SUBSCRIPTIONGROUP_CONFIG, null);
|
RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_SUBSCRIPTIONGROUP_CONFIG, null);
|
||||||
RemotingCommand response = null;
|
RemotingCommand response = null;
|
||||||
@@ -136,7 +148,8 @@ public class MQAdminExtImpl implements MQAdminExt {
|
|||||||
response = remotingClient.invokeSync(addr, request, 3000);
|
response = remotingClient.invokeSync(addr, request, 3000);
|
||||||
}
|
}
|
||||||
catch (Exception err) {
|
catch (Exception err) {
|
||||||
throw Throwables.propagate(err);
|
Throwables.throwIfUnchecked(err);
|
||||||
|
throw new RuntimeException(err);
|
||||||
}
|
}
|
||||||
assert response != null;
|
assert response != null;
|
||||||
switch (response.getCode()) {
|
switch (response.getCode()) {
|
||||||
@@ -145,12 +158,12 @@ public class MQAdminExtImpl implements MQAdminExt {
|
|||||||
return subscriptionGroupWrapper.getSubscriptionGroupTable().get(group);
|
return subscriptionGroupWrapper.getSubscriptionGroupTable().get(group);
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
throw Throwables.propagate(new MQBrokerException(response.getCode(), response.getRemark()));
|
throw new MQBrokerException(response.getCode(), response.getRemark());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public TopicConfig examineTopicConfig(String addr, String topic) {
|
public TopicConfig examineTopicConfig(String addr, String topic) throws MQBrokerException {
|
||||||
RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
|
RemotingClient remotingClient = MQAdminInstance.threadLocalRemotingClient();
|
||||||
RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_TOPIC_CONFIG, null);
|
RemotingCommand request = RemotingCommand.createRequestCommand(RequestCode.GET_ALL_TOPIC_CONFIG, null);
|
||||||
RemotingCommand response = null;
|
RemotingCommand response = null;
|
||||||
@@ -158,7 +171,8 @@ public class MQAdminExtImpl implements MQAdminExt {
|
|||||||
response = remotingClient.invokeSync(addr, request, 3000);
|
response = remotingClient.invokeSync(addr, request, 3000);
|
||||||
}
|
}
|
||||||
catch (Exception err) {
|
catch (Exception err) {
|
||||||
throw Throwables.propagate(err);
|
Throwables.throwIfUnchecked(err);
|
||||||
|
throw new RuntimeException(err);
|
||||||
}
|
}
|
||||||
switch (response.getCode()) {
|
switch (response.getCode()) {
|
||||||
case ResponseCode.SUCCESS: {
|
case ResponseCode.SUCCESS: {
|
||||||
@@ -166,7 +180,7 @@ public class MQAdminExtImpl implements MQAdminExt {
|
|||||||
return topicConfigSerializeWrapper.getTopicConfigTable().get(topic);
|
return topicConfigSerializeWrapper.getTopicConfigTable().get(topic);
|
||||||
}
|
}
|
||||||
default:
|
default:
|
||||||
throw Throwables.propagate(new MQBrokerException(response.getCode(), response.getRemark()));
|
throw new MQBrokerException(response.getCode(), response.getRemark());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -376,14 +390,14 @@ public class MQAdminExtImpl implements MQAdminExt {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void createTopic(String key, String newTopic, int queueNum) throws MQClientException {
|
public void createTopic(String key, String newTopic, int queueNum, Map<String, String> attributes) throws MQClientException {
|
||||||
MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum);
|
MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum, attributes);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void createTopic(String key, String newTopic, int queueNum, int topicSysFlag)
|
public void createTopic(String key, String newTopic, int queueNum, int topicSysFlag, Map<String, String> attributes)
|
||||||
throws MQClientException {
|
throws MQClientException {
|
||||||
MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum, topicSysFlag);
|
MQAdminInstance.threadLocalMQAdminExt().createTopic(key, newTopic, queueNum, topicSysFlag, attributes);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -572,4 +586,257 @@ public class MQAdminExtImpl implements MQAdminExt {
|
|||||||
String msgId) throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
|
String msgId) throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void addBrokerToContainer(String brokerContainerAddr, String brokerConfig) throws InterruptedException,
|
||||||
|
MQBrokerException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'addBrokerToContainer'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void removeBrokerFromContainer(String brokerContainerAddr, String clusterName, String brokerName,
|
||||||
|
long brokerId) throws InterruptedException, MQBrokerException, RemotingTimeoutException,
|
||||||
|
RemotingSendRequestException, RemotingConnectException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'removeBrokerFromContainer'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateGlobalWhiteAddrConfig(String addr, String globalWhiteAddrs, String aclFileFullPath)
|
||||||
|
throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'updateGlobalWhiteAddrConfig'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TopicStatsTable examineTopicStats(String brokerAddr, String topic)
|
||||||
|
throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'examineTopicStats'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AdminToolResult<TopicStatsTable> examineTopicStatsConcurrent(String topic) {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'examineTopicStatsConcurrent'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ConsumeStats examineConsumeStats(String brokerAddr, String consumerGroup, String topicName,
|
||||||
|
long timeoutMillis) throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException,
|
||||||
|
RemotingConnectException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'examineConsumeStats'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AdminToolResult<ConsumeStats> examineConsumeStatsConcurrent(String consumerGroup, String topic) {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'examineConsumeStatsConcurrent'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ConsumerConnection examineConsumerConnectionInfo(String consumerGroup, String brokerAddr)
|
||||||
|
throws InterruptedException, MQBrokerException, RemotingException, MQClientException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'examineConsumerConnectionInfo'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ProducerTableInfo getAllProducerInfo(String brokerAddr)
|
||||||
|
throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'getAllProducerInfo'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteTopic(String topicName, String clusterName)
|
||||||
|
throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'deleteTopic'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AdminToolResult<BrokerOperatorResult> deleteTopicInBrokerConcurrent(Set<String> addrs, String topic) {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'deleteTopicInBrokerConcurrent'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void deleteTopicInNameServer(Set<String> addrs, String clusterName, String topic)
|
||||||
|
throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'deleteTopicInNameServer'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AdminToolResult<BrokerOperatorResult> resetOffsetNewConcurrent(String group, String topic, long timestamp) {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'resetOffsetNewConcurrent'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public TopicList queryTopicsByConsumer(String group)
|
||||||
|
throws InterruptedException, MQBrokerException, RemotingException, MQClientException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'queryTopicsByConsumer'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AdminToolResult<TopicList> queryTopicsByConsumerConcurrent(String group) {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'queryTopicsByConsumerConcurrent'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public SubscriptionData querySubscription(String group, String topic)
|
||||||
|
throws InterruptedException, MQBrokerException, RemotingException, MQClientException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'querySubscription'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public AdminToolResult<List<QueueTimeSpan>> queryConsumeTimeSpanConcurrent(String topic, String group) {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'queryConsumeTimeSpanConcurrent'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean deleteExpiredCommitLog(String cluster) throws RemotingConnectException, RemotingSendRequestException,
|
||||||
|
RemotingTimeoutException, MQClientException, InterruptedException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'deleteExpiredCommitLog'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean deleteExpiredCommitLogByAddr(String addr) throws RemotingConnectException,
|
||||||
|
RemotingSendRequestException, RemotingTimeoutException, MQClientException, InterruptedException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'deleteExpiredCommitLogByAddr'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ConsumerRunningInfo getConsumerRunningInfo(String consumerGroup, String clientId, boolean jstack,
|
||||||
|
boolean metrics) throws RemotingException, MQClientException, InterruptedException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'getConsumerRunningInfo'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public List<MessageTrack> messageTrackDetailConcurrent(MessageExt msg)
|
||||||
|
throws RemotingException, MQClientException, InterruptedException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'messageTrackDetailConcurrent'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void setMessageRequestMode(String brokerAddr, String topic, String consumerGroup, MessageRequestMode mode,
|
||||||
|
int popWorkGroupSize, long timeoutMillis) throws InterruptedException, RemotingTimeoutException,
|
||||||
|
RemotingSendRequestException, RemotingConnectException, MQClientException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'setMessageRequestMode'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public long searchOffset(String brokerAddr, String topicName, int queueId, long timestamp, long timeoutMillis)
|
||||||
|
throws RemotingException, MQBrokerException, InterruptedException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'searchOffset'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void resetOffsetByQueueId(String brokerAddr, String consumerGroup, String topicName, int queueId,
|
||||||
|
long resetOffset) throws RemotingException, InterruptedException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'resetOffsetByQueueId'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void createStaticTopic(String addr, String defaultTopic, TopicConfig topicConfig,
|
||||||
|
TopicQueueMappingDetail mappingDetail, boolean force)
|
||||||
|
throws RemotingException, InterruptedException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'createStaticTopic'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GroupForbidden updateAndGetGroupReadForbidden(String brokerAddr, String groupName, String topicName,
|
||||||
|
Boolean readable) throws RemotingException, InterruptedException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'updateAndGetGroupReadForbidden'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public MessageExt queryMessage(String clusterName, String topic, String msgId)
|
||||||
|
throws RemotingException, MQBrokerException, InterruptedException, MQClientException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'queryMessage'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public HARuntimeInfo getBrokerHAStatus(String brokerAddr) throws RemotingConnectException,
|
||||||
|
RemotingSendRequestException, RemotingTimeoutException, InterruptedException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'getBrokerHAStatus'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public BrokerReplicasInfo getInSyncStateData(String controllerAddress, List<String> brokers)
|
||||||
|
throws RemotingException, InterruptedException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'getInSyncStateData'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public EpochEntryCache getBrokerEpochCache(String brokerAddr)
|
||||||
|
throws RemotingException, InterruptedException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'getBrokerEpochCache'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public GetMetaDataResponseHeader getControllerMetaData(String controllerAddr)
|
||||||
|
throws RemotingException, InterruptedException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'getControllerMetaData'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void resetMasterFlushOffset(String brokerAddr, long masterFlushOffset) throws InterruptedException,
|
||||||
|
MQBrokerException, RemotingTimeoutException, RemotingSendRequestException, RemotingConnectException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'resetMasterFlushOffset'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Map<String, Properties> getControllerConfig(List<String> controllerServers)
|
||||||
|
throws InterruptedException, RemotingTimeoutException, RemotingSendRequestException,
|
||||||
|
RemotingConnectException, MQClientException, UnsupportedEncodingException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'getControllerConfig'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void updateControllerConfig(Properties properties, List<String> controllers)
|
||||||
|
throws InterruptedException, RemotingConnectException, UnsupportedEncodingException,
|
||||||
|
RemotingSendRequestException, RemotingTimeoutException, MQClientException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'updateControllerConfig'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ElectMasterResponseHeader electMaster(String controllerAddr, String clusterName, String brokerName,
|
||||||
|
String brokerAddr) throws RemotingException, InterruptedException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'electMaster'");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void cleanControllerBrokerData(String controllerAddr, String clusterName, String brokerName,
|
||||||
|
String brokerAddr, boolean isCleanLivingBroker)
|
||||||
|
throws RemotingException, InterruptedException, MQBrokerException {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
throw new UnsupportedOperationException("Unimplemented method 'cleanControllerBrokerData'");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -36,8 +36,8 @@ import org.apache.rocketmq.client.exception.MQClientException;
|
|||||||
import org.apache.rocketmq.common.AclConfig;
|
import org.apache.rocketmq.common.AclConfig;
|
||||||
import org.apache.rocketmq.common.MixAll;
|
import org.apache.rocketmq.common.MixAll;
|
||||||
import org.apache.rocketmq.common.PlainAccessConfig;
|
import org.apache.rocketmq.common.PlainAccessConfig;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.common.protocol.route.BrokerData;
|
import org.apache.rocketmq.remoting.protocol.route.BrokerData;
|
||||||
import org.apache.rocketmq.dashboard.model.request.AclRequest;
|
import org.apache.rocketmq.dashboard.model.request.AclRequest;
|
||||||
import org.apache.rocketmq.dashboard.service.AbstractCommonService;
|
import org.apache.rocketmq.dashboard.service.AbstractCommonService;
|
||||||
import org.apache.rocketmq.dashboard.service.AclService;
|
import org.apache.rocketmq.dashboard.service.AclService;
|
||||||
@@ -68,7 +68,8 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
|
|||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("getAclConfig error.", e);
|
log.error("getAclConfig error.", e);
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
AclConfig aclConfig = new AclConfig();
|
AclConfig aclConfig = new AclConfig();
|
||||||
aclConfig.setGlobalWhiteAddrs(Collections.emptyList());
|
aclConfig.setGlobalWhiteAddrs(Collections.emptyList());
|
||||||
@@ -100,7 +101,8 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
|
|||||||
mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
|
mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -116,7 +118,8 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
|
|||||||
log.info("Delete acl [{}] from broker [{}] complete", config.getAccessKey(), addr);
|
log.info("Delete acl [{}] from broker [{}] complete", config.getAccessKey(), addr);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -142,7 +145,8 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
|
|||||||
mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
|
mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -174,7 +178,8 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -206,7 +211,8 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -249,7 +255,8 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -261,7 +268,8 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
|
|||||||
mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
|
mqAdminExt.createAndUpdatePlainAccessConfig(addr, config);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -281,7 +289,8 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
|
|||||||
mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(aclConfig.getGlobalWhiteAddrs(), ","));
|
mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(aclConfig.getGlobalWhiteAddrs(), ","));
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -297,7 +306,8 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
|
|||||||
mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(aclConfig.getGlobalWhiteAddrs(), ","));
|
mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(aclConfig.getGlobalWhiteAddrs(), ","));
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -311,7 +321,8 @@ public class AclServiceImpl extends AbstractCommonService implements AclService
|
|||||||
mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(whiteList, ","));
|
mqAdminExt.updateGlobalWhiteAddrConfig(addr, StringUtils.join(whiteList, ","));
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,9 +17,9 @@
|
|||||||
|
|
||||||
package org.apache.rocketmq.dashboard.service.impl;
|
package org.apache.rocketmq.dashboard.service.impl;
|
||||||
|
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.KVTable;
|
import org.apache.rocketmq.remoting.protocol.body.KVTable;
|
||||||
import org.apache.rocketmq.common.protocol.route.BrokerData;
|
import org.apache.rocketmq.remoting.protocol.route.BrokerData;
|
||||||
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
||||||
import org.apache.rocketmq.dashboard.service.ClusterService;
|
import org.apache.rocketmq.dashboard.service.ClusterService;
|
||||||
import org.apache.rocketmq.dashboard.util.JsonUtil;
|
import org.apache.rocketmq.dashboard.util.JsonUtil;
|
||||||
@@ -59,7 +59,8 @@ public class ClusterServiceImpl implements ClusterService {
|
|||||||
return resultMap;
|
return resultMap;
|
||||||
}
|
}
|
||||||
catch (Exception err) {
|
catch (Exception err) {
|
||||||
throw Throwables.propagate(err);
|
Throwables.throwIfUnchecked(err);
|
||||||
|
throw new RuntimeException(err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,7 +71,8 @@ public class ClusterServiceImpl implements ClusterService {
|
|||||||
return mqAdminExt.getBrokerConfig(brokerAddr);
|
return mqAdminExt.getBrokerConfig(brokerAddr);
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,6 +29,14 @@ import java.util.HashSet;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
import java.util.concurrent.CountDownLatch;
|
||||||
|
import java.util.concurrent.ExecutorService;
|
||||||
|
import java.util.concurrent.LinkedBlockingQueue;
|
||||||
|
import java.util.concurrent.RejectedExecutionHandler;
|
||||||
|
import java.util.concurrent.ThreadFactory;
|
||||||
|
import java.util.concurrent.ThreadPoolExecutor;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
import java.util.concurrent.atomic.AtomicLong;
|
||||||
import java.util.stream.Collectors;
|
import java.util.stream.Collectors;
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import org.apache.commons.collections.CollectionUtils;
|
import org.apache.commons.collections.CollectionUtils;
|
||||||
@@ -36,18 +44,19 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
import org.apache.rocketmq.client.exception.MQClientException;
|
import org.apache.rocketmq.client.exception.MQClientException;
|
||||||
import org.apache.rocketmq.common.MQVersion;
|
import org.apache.rocketmq.common.MQVersion;
|
||||||
import org.apache.rocketmq.common.MixAll;
|
import org.apache.rocketmq.common.MixAll;
|
||||||
import org.apache.rocketmq.common.admin.ConsumeStats;
|
import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
|
||||||
import org.apache.rocketmq.common.admin.RollbackStats;
|
import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
|
||||||
import org.apache.rocketmq.common.message.MessageQueue;
|
import org.apache.rocketmq.common.message.MessageQueue;
|
||||||
import org.apache.rocketmq.common.protocol.ResponseCode;
|
import org.apache.rocketmq.remoting.protocol.ResponseCode;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.Connection;
|
import org.apache.rocketmq.remoting.protocol.body.Connection;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.GroupList;
|
import org.apache.rocketmq.remoting.protocol.body.GroupList;
|
||||||
import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
|
import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
|
||||||
import org.apache.rocketmq.common.protocol.route.BrokerData;
|
import org.apache.rocketmq.remoting.protocol.route.BrokerData;
|
||||||
import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
|
import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
|
||||||
|
import org.apache.rocketmq.common.utils.ThreadUtils;
|
||||||
import org.apache.rocketmq.dashboard.config.RMQConfigure;
|
import org.apache.rocketmq.dashboard.config.RMQConfigure;
|
||||||
import org.apache.rocketmq.dashboard.model.ConsumerGroupRollBackStat;
|
import org.apache.rocketmq.dashboard.model.ConsumerGroupRollBackStat;
|
||||||
import org.apache.rocketmq.dashboard.model.GroupConsumeInfo;
|
import org.apache.rocketmq.dashboard.model.GroupConsumeInfo;
|
||||||
@@ -60,12 +69,12 @@ import org.apache.rocketmq.dashboard.service.AbstractCommonService;
|
|||||||
import org.apache.rocketmq.dashboard.service.ConsumerService;
|
import org.apache.rocketmq.dashboard.service.ConsumerService;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import org.springframework.beans.factory.DisposableBean;
|
||||||
|
import org.springframework.beans.factory.InitializingBean;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import static com.google.common.base.Throwables.propagate;
|
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class ConsumerServiceImpl extends AbstractCommonService implements ConsumerService {
|
public class ConsumerServiceImpl extends AbstractCommonService implements ConsumerService, InitializingBean, DisposableBean {
|
||||||
private Logger logger = LoggerFactory.getLogger(ConsumerServiceImpl.class);
|
private Logger logger = LoggerFactory.getLogger(ConsumerServiceImpl.class);
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
@@ -73,6 +82,31 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
|
|||||||
|
|
||||||
private static final Set<String> SYSTEM_GROUP_SET = new HashSet<>();
|
private static final Set<String> SYSTEM_GROUP_SET = new HashSet<>();
|
||||||
|
|
||||||
|
private ExecutorService executorService;
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void afterPropertiesSet() {
|
||||||
|
Runtime runtime = Runtime.getRuntime();
|
||||||
|
int corePoolSize = Math.max(10, runtime.availableProcessors() * 2);
|
||||||
|
int maximumPoolSize = Math.max(20, runtime.availableProcessors() * 2);
|
||||||
|
ThreadFactory threadFactory = new ThreadFactory() {
|
||||||
|
private final AtomicLong threadIndex = new AtomicLong(0);
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Thread newThread(Runnable r) {
|
||||||
|
return new Thread(r, "QueryGroup_" + this.threadIndex.incrementAndGet());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
RejectedExecutionHandler handler = new ThreadPoolExecutor.DiscardOldestPolicy();
|
||||||
|
this.executorService = new ThreadPoolExecutor(corePoolSize, maximumPoolSize, 60L, TimeUnit.SECONDS,
|
||||||
|
new LinkedBlockingQueue<>(5000), threadFactory, handler);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void destroy() {
|
||||||
|
ThreadUtils.shutdownGracefully(executorService, 10L, TimeUnit.SECONDS);
|
||||||
|
}
|
||||||
|
|
||||||
static {
|
static {
|
||||||
SYSTEM_GROUP_SET.add(MixAll.TOOLS_CONSUMER_GROUP);
|
SYSTEM_GROUP_SET.add(MixAll.TOOLS_CONSUMER_GROUP);
|
||||||
SYSTEM_GROUP_SET.add(MixAll.FILTERSRV_CONSUMER_GROUP);
|
SYSTEM_GROUP_SET.add(MixAll.FILTERSRV_CONSUMER_GROUP);
|
||||||
@@ -95,12 +129,29 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception err) {
|
catch (Exception err) {
|
||||||
throw Throwables.propagate(err);
|
Throwables.throwIfUnchecked(err);
|
||||||
|
throw new RuntimeException(err);
|
||||||
}
|
}
|
||||||
List<GroupConsumeInfo> groupConsumeInfoList = Lists.newArrayList();
|
List<GroupConsumeInfo> groupConsumeInfoList = Collections.synchronizedList(Lists.newArrayList());
|
||||||
|
CountDownLatch countDownLatch = new CountDownLatch(consumerGroupSet.size());
|
||||||
for (String consumerGroup : consumerGroupSet) {
|
for (String consumerGroup : consumerGroupSet) {
|
||||||
groupConsumeInfoList.add(queryGroup(consumerGroup));
|
executorService.submit(() -> {
|
||||||
|
try {
|
||||||
|
GroupConsumeInfo consumeInfo = queryGroup(consumerGroup);
|
||||||
|
groupConsumeInfoList.add(consumeInfo);
|
||||||
|
} catch (Exception e) {
|
||||||
|
logger.error("queryGroup exception, consumerGroup: {}", consumerGroup, e);
|
||||||
|
} finally {
|
||||||
|
countDownLatch.countDown();
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
try {
|
||||||
|
countDownLatch.await(30, TimeUnit.SECONDS);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
logger.error("query consumerGroup countDownLatch await Exception", e);
|
||||||
|
}
|
||||||
|
|
||||||
if (!skipSysGroup) {
|
if (!skipSysGroup) {
|
||||||
groupConsumeInfoList.stream().map(group -> {
|
groupConsumeInfoList.stream().map(group -> {
|
||||||
if (SYSTEM_GROUP_SET.contains(group.getGroup())) {
|
if (SYSTEM_GROUP_SET.contains(group.getGroup())) {
|
||||||
@@ -166,7 +217,8 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
|
|||||||
consumeStats = mqAdminExt.examineConsumeStats(groupName, topic);
|
consumeStats = mqAdminExt.examineConsumeStats(groupName, topic);
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
List<MessageQueue> mqList = Lists.newArrayList(Iterables.filter(consumeStats.getOffsetTable().keySet(), new Predicate<MessageQueue>() {
|
List<MessageQueue> mqList = Lists.newArrayList(Iterables.filter(consumeStats.getOffsetTable().keySet(), new Predicate<MessageQueue>() {
|
||||||
@Override
|
@Override
|
||||||
@@ -226,7 +278,8 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
|
|||||||
return group2ConsumerInfoMap;
|
return group2ConsumerInfoMap;
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -289,7 +342,8 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
return consumerConfigInfoList;
|
return consumerConfigInfoList;
|
||||||
}
|
}
|
||||||
@@ -314,7 +368,8 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -341,7 +396,8 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception err) {
|
catch (Exception err) {
|
||||||
throw Throwables.propagate(err);
|
Throwables.throwIfUnchecked(err);
|
||||||
|
throw new RuntimeException(err);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -356,7 +412,8 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
return brokerNameSet;
|
return brokerNameSet;
|
||||||
|
|
||||||
@@ -368,7 +425,8 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
|
|||||||
return mqAdminExt.examineConsumerConnectionInfo(consumerGroup);
|
return mqAdminExt.examineConsumerConnectionInfo(consumerGroup);
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -378,7 +436,8 @@ public class ConsumerServiceImpl extends AbstractCommonService implements Consum
|
|||||||
return mqAdminExt.getConsumerRunningInfo(consumerGroup, clientId, jstack);
|
return mqAdminExt.getConsumerRunningInfo(consumerGroup, clientId, jstack);
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -107,7 +107,8 @@ public class DashboardCollectServiceImpl implements DashboardCollectService {
|
|||||||
strings = Files.readLines(file, Charsets.UTF_8);
|
strings = Files.readLines(file, Charsets.UTF_8);
|
||||||
}
|
}
|
||||||
catch (IOException e) {
|
catch (IOException e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
StringBuffer sb = new StringBuffer();
|
StringBuffer sb = new StringBuffer();
|
||||||
for (String string : strings) {
|
for (String string : strings) {
|
||||||
|
|||||||
@@ -25,8 +25,8 @@ import javax.annotation.Resource;
|
|||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.rocketmq.client.exception.MQClientException;
|
import org.apache.rocketmq.client.exception.MQClientException;
|
||||||
import org.apache.rocketmq.common.MixAll;
|
import org.apache.rocketmq.common.MixAll;
|
||||||
import org.apache.rocketmq.common.protocol.ResponseCode;
|
import org.apache.rocketmq.remoting.protocol.ResponseCode;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
|
||||||
import org.apache.rocketmq.dashboard.model.DlqMessageResendResult;
|
import org.apache.rocketmq.dashboard.model.DlqMessageResendResult;
|
||||||
import org.apache.rocketmq.dashboard.model.DlqMessageRequest;
|
import org.apache.rocketmq.dashboard.model.DlqMessageRequest;
|
||||||
import org.apache.rocketmq.dashboard.model.MessagePage;
|
import org.apache.rocketmq.dashboard.model.MessagePage;
|
||||||
@@ -62,10 +62,12 @@ public class DlqMessageServiceImpl implements DlqMessageService {
|
|||||||
&& e.getResponseCode() == ResponseCode.TOPIC_NOT_EXIST) {
|
&& e.getResponseCode() == ResponseCode.TOPIC_NOT_EXIST) {
|
||||||
return new MessagePage(new PageImpl<>(messageViews, page, 0), query.getTaskId());
|
return new MessagePage(new PageImpl<>(messageViews, page, 0), query.getTaskId());
|
||||||
} else {
|
} else {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
return messageService.queryMessageByPage(query);
|
return messageService.queryMessageByPage(query);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -37,9 +37,9 @@ import org.apache.rocketmq.common.Pair;
|
|||||||
import org.apache.rocketmq.common.message.MessageClientIDSetter;
|
import org.apache.rocketmq.common.message.MessageClientIDSetter;
|
||||||
import org.apache.rocketmq.common.message.MessageExt;
|
import org.apache.rocketmq.common.message.MessageExt;
|
||||||
import org.apache.rocketmq.common.message.MessageQueue;
|
import org.apache.rocketmq.common.message.MessageQueue;
|
||||||
import org.apache.rocketmq.common.protocol.body.Connection;
|
import org.apache.rocketmq.remoting.protocol.body.Connection;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
|
||||||
import org.apache.rocketmq.dashboard.config.RMQConfigure;
|
import org.apache.rocketmq.dashboard.config.RMQConfigure;
|
||||||
import org.apache.rocketmq.dashboard.exception.ServiceException;
|
import org.apache.rocketmq.dashboard.exception.ServiceException;
|
||||||
import org.apache.rocketmq.dashboard.model.QueueOffsetInfo;
|
import org.apache.rocketmq.dashboard.model.QueueOffsetInfo;
|
||||||
@@ -115,7 +115,8 @@ public class MessageServiceImpl implements MessageService {
|
|||||||
if (err instanceof MQClientException) {
|
if (err instanceof MQClientException) {
|
||||||
throw new ServiceException(-1, ((MQClientException) err).getErrorMessage());
|
throw new ServiceException(-1, ((MQClientException) err).getErrorMessage());
|
||||||
}
|
}
|
||||||
throw Throwables.propagate(err);
|
Throwables.throwIfUnchecked(err);
|
||||||
|
throw new RuntimeException(err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -185,7 +186,8 @@ public class MessageServiceImpl implements MessageService {
|
|||||||
});
|
});
|
||||||
return messageViewList;
|
return messageViewList;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
} finally {
|
} finally {
|
||||||
consumer.shutdown();
|
consumer.shutdown();
|
||||||
}
|
}
|
||||||
@@ -209,7 +211,8 @@ public class MessageServiceImpl implements MessageService {
|
|||||||
try {
|
try {
|
||||||
return mqAdminExt.consumeMessageDirectly(consumerGroup, clientId, topic, msgId);
|
return mqAdminExt.consumeMessageDirectly(consumerGroup, clientId, topic, msgId);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -223,7 +226,8 @@ public class MessageServiceImpl implements MessageService {
|
|||||||
return mqAdminExt.consumeMessageDirectly(consumerGroup, connection.getClientId(), topic, msgId);
|
return mqAdminExt.consumeMessageDirectly(consumerGroup, connection.getClientId(), topic, msgId);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
throw new IllegalStateException("NO CONSUMER");
|
throw new IllegalStateException("NO CONSUMER");
|
||||||
|
|
||||||
@@ -388,7 +392,8 @@ public class MessageServiceImpl implements MessageService {
|
|||||||
PageImpl<MessageView> page = new PageImpl<>(messageViews, query.page(), total);
|
PageImpl<MessageView> page = new PageImpl<>(messageViews, query.page(), total);
|
||||||
return new MessagePageTask(page, queueOffsetInfos);
|
return new MessagePageTask(page, queueOffsetInfos);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
} finally {
|
} finally {
|
||||||
consumer.shutdown();
|
consumer.shutdown();
|
||||||
}
|
}
|
||||||
@@ -455,7 +460,8 @@ public class MessageServiceImpl implements MessageService {
|
|||||||
}
|
}
|
||||||
return new PageImpl<>(messageViews, query.page(), total);
|
return new PageImpl<>(messageViews, query.page(), total);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
} finally {
|
} finally {
|
||||||
consumer.shutdown();
|
consumer.shutdown();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,7 +82,8 @@ public class MonitorServiceImpl implements MonitorService {
|
|||||||
MixAll.string2File(dataStr, path);
|
MixAll.string2File(dataStr, path);
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ package org.apache.rocketmq.dashboard.service.impl;
|
|||||||
|
|
||||||
import com.google.common.base.Throwables;
|
import com.google.common.base.Throwables;
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import org.apache.rocketmq.common.protocol.body.ProducerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
|
||||||
import org.apache.rocketmq.dashboard.service.ProducerService;
|
import org.apache.rocketmq.dashboard.service.ProducerService;
|
||||||
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -35,7 +35,8 @@ public class ProducerServiceImpl implements ProducerService {
|
|||||||
return mqAdminExt.examineProducerConnectionInfo(producerGroup, topic);
|
return mqAdminExt.examineProducerConnectionInfo(producerGroup, topic);
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,13 +30,13 @@ import org.apache.rocketmq.client.trace.TraceContext;
|
|||||||
import org.apache.rocketmq.client.trace.TraceDispatcher;
|
import org.apache.rocketmq.client.trace.TraceDispatcher;
|
||||||
import org.apache.rocketmq.common.MixAll;
|
import org.apache.rocketmq.common.MixAll;
|
||||||
import org.apache.rocketmq.common.TopicConfig;
|
import org.apache.rocketmq.common.TopicConfig;
|
||||||
import org.apache.rocketmq.common.admin.TopicStatsTable;
|
import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
|
||||||
import org.apache.rocketmq.common.message.Message;
|
import org.apache.rocketmq.common.message.Message;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.GroupList;
|
import org.apache.rocketmq.remoting.protocol.body.GroupList;
|
||||||
import org.apache.rocketmq.common.protocol.body.TopicList;
|
import org.apache.rocketmq.remoting.protocol.body.TopicList;
|
||||||
import org.apache.rocketmq.common.protocol.route.BrokerData;
|
import org.apache.rocketmq.remoting.protocol.route.BrokerData;
|
||||||
import org.apache.rocketmq.common.protocol.route.TopicRouteData;
|
import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
|
||||||
import org.apache.rocketmq.common.topic.TopicValidator;
|
import org.apache.rocketmq.common.topic.TopicValidator;
|
||||||
import org.apache.rocketmq.dashboard.config.RMQConfigure;
|
import org.apache.rocketmq.dashboard.config.RMQConfigure;
|
||||||
import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
|
import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
|
||||||
@@ -84,7 +84,8 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
|
|||||||
allTopics.getTopicList().addAll(topics);
|
allTopics.getTopicList().addAll(topics);
|
||||||
return allTopics;
|
return allTopics;
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -93,7 +94,8 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
|
|||||||
try {
|
try {
|
||||||
return mqAdminExt.examineTopicStats(topic);
|
return mqAdminExt.examineTopicStats(topic);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,7 +104,8 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
|
|||||||
try {
|
try {
|
||||||
return mqAdminExt.examineTopicRouteInfo(topic);
|
return mqAdminExt.examineTopicRouteInfo(topic);
|
||||||
} catch (Exception ex) {
|
} catch (Exception ex) {
|
||||||
throw Throwables.propagate(ex);
|
Throwables.throwIfUnchecked(ex);
|
||||||
|
throw new RuntimeException(ex);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -111,7 +114,8 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
|
|||||||
try {
|
try {
|
||||||
return mqAdminExt.queryTopicConsumeByWho(topic);
|
return mqAdminExt.queryTopicConsumeByWho(topic);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -126,7 +130,8 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
|
|||||||
mqAdminExt.createAndUpdateTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topicConfig);
|
mqAdminExt.createAndUpdateTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topicConfig);
|
||||||
}
|
}
|
||||||
} catch (Exception err) {
|
} catch (Exception err) {
|
||||||
throw Throwables.propagate(err);
|
Throwables.throwIfUnchecked(err);
|
||||||
|
throw new RuntimeException(err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,7 +142,8 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
|
|||||||
clusterInfo = mqAdminExt.examineBrokerClusterInfo();
|
clusterInfo = mqAdminExt.examineBrokerClusterInfo();
|
||||||
return mqAdminExt.examineTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topic);
|
return mqAdminExt.examineTopicConfig(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr(), topic);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -170,7 +176,8 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
|
|||||||
}
|
}
|
||||||
mqAdminExt.deleteTopicInNameServer(nameServerSet, topic);
|
mqAdminExt.deleteTopicInNameServer(nameServerSet, topic);
|
||||||
} catch (Exception err) {
|
} catch (Exception err) {
|
||||||
throw Throwables.propagate(err);
|
Throwables.throwIfUnchecked(err);
|
||||||
|
throw new RuntimeException(err);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -181,7 +188,8 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
|
|||||||
try {
|
try {
|
||||||
clusterInfo = mqAdminExt.examineBrokerClusterInfo();
|
clusterInfo = mqAdminExt.examineBrokerClusterInfo();
|
||||||
} catch (Exception err) {
|
} catch (Exception err) {
|
||||||
throw Throwables.propagate(err);
|
Throwables.throwIfUnchecked(err);
|
||||||
|
throw new RuntimeException(err);
|
||||||
}
|
}
|
||||||
for (String clusterName : clusterInfo.getClusterAddrTable().keySet()) {
|
for (String clusterName : clusterInfo.getClusterAddrTable().keySet()) {
|
||||||
deleteTopic(topic, clusterName);
|
deleteTopic(topic, clusterName);
|
||||||
@@ -197,11 +205,13 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
|
|||||||
try {
|
try {
|
||||||
clusterInfo = mqAdminExt.examineBrokerClusterInfo();
|
clusterInfo = mqAdminExt.examineBrokerClusterInfo();
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
mqAdminExt.deleteTopicInBroker(Sets.newHashSet(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr()), topic);
|
mqAdminExt.deleteTopicInBroker(Sets.newHashSet(clusterInfo.getBrokerAddrTable().get(brokerName).selectBrokerAddr()), topic);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -230,7 +240,8 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
|
|||||||
producer.start();
|
producer.start();
|
||||||
return producer.getDefaultMQProducerImpl().getmQClientFactory().getMQClientAPIImpl().getSystemTopicList(20000L);
|
return producer.getDefaultMQProducerImpl().getmQClientFactory().getMQClientAPIImpl().getSystemTopicList(20000L);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
} finally {
|
} finally {
|
||||||
producer.shutdown();
|
producer.shutdown();
|
||||||
}
|
}
|
||||||
@@ -258,7 +269,8 @@ public class TopicServiceImpl extends AbstractCommonService implements TopicServ
|
|||||||
);
|
);
|
||||||
return producer.send(msg);
|
return producer.send(msg);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
} finally {
|
} finally {
|
||||||
waitSendTraceFinish(producer, sendTopicMessageRequest.isTraceEnabled());
|
waitSendTraceFinish(producer, sendTopicMessageRequest.isTraceEnabled());
|
||||||
producer.shutdown();
|
producer.shutdown();
|
||||||
|
|||||||
@@ -24,10 +24,10 @@ import java.util.List;
|
|||||||
import java.util.concurrent.ExecutionException;
|
import java.util.concurrent.ExecutionException;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.apache.rocketmq.common.MixAll;
|
import org.apache.rocketmq.common.MixAll;
|
||||||
import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
|
import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
|
||||||
import org.apache.rocketmq.common.protocol.body.GroupList;
|
import org.apache.rocketmq.remoting.protocol.body.GroupList;
|
||||||
import org.apache.rocketmq.common.protocol.route.BrokerData;
|
import org.apache.rocketmq.remoting.protocol.route.BrokerData;
|
||||||
import org.apache.rocketmq.common.protocol.route.TopicRouteData;
|
import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
|
||||||
import org.apache.rocketmq.dashboard.service.DashboardCollectService;
|
import org.apache.rocketmq.dashboard.service.DashboardCollectService;
|
||||||
import org.apache.rocketmq.store.stats.BrokerStatsManager;
|
import org.apache.rocketmq.store.stats.BrokerStatsManager;
|
||||||
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
||||||
@@ -93,7 +93,8 @@ public class CollectTaskRunnble implements Runnable {
|
|||||||
try {
|
try {
|
||||||
list = dashboardCollectService.getTopicMap().get(topic);
|
list = dashboardCollectService.getTopicMap().get(topic);
|
||||||
} catch (ExecutionException e) {
|
} catch (ExecutionException e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
if (null == list) {
|
if (null == list) {
|
||||||
list = Lists.newArrayList();
|
list = Lists.newArrayList();
|
||||||
|
|||||||
@@ -34,10 +34,10 @@ import java.util.Set;
|
|||||||
import java.util.concurrent.ExecutorService;
|
import java.util.concurrent.ExecutorService;
|
||||||
import javax.annotation.Resource;
|
import javax.annotation.Resource;
|
||||||
import org.apache.rocketmq.common.MixAll;
|
import org.apache.rocketmq.common.MixAll;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.KVTable;
|
import org.apache.rocketmq.remoting.protocol.body.KVTable;
|
||||||
import org.apache.rocketmq.common.protocol.body.TopicList;
|
import org.apache.rocketmq.remoting.protocol.body.TopicList;
|
||||||
import org.apache.rocketmq.common.protocol.route.BrokerData;
|
import org.apache.rocketmq.remoting.protocol.route.BrokerData;
|
||||||
import org.apache.rocketmq.common.topic.TopicValidator;
|
import org.apache.rocketmq.common.topic.TopicValidator;
|
||||||
import org.apache.rocketmq.dashboard.config.RMQConfigure;
|
import org.apache.rocketmq.dashboard.config.RMQConfigure;
|
||||||
import org.apache.rocketmq.dashboard.service.DashboardCollectService;
|
import org.apache.rocketmq.dashboard.service.DashboardCollectService;
|
||||||
@@ -84,7 +84,8 @@ public class DashboardCollectTask {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception err) {
|
catch (Exception err) {
|
||||||
throw Throwables.propagate(err);
|
Throwables.throwIfUnchecked(err);
|
||||||
|
throw new RuntimeException(err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -128,7 +129,8 @@ public class DashboardCollectTask {
|
|||||||
log.debug("Broker Collected Data in memory = {}" + JsonUtil.obj2String(dashboardCollectService.getBrokerMap().asMap()));
|
log.debug("Broker Collected Data in memory = {}" + JsonUtil.obj2String(dashboardCollectService.getBrokerMap().asMap()));
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -144,10 +146,12 @@ public class DashboardCollectTask {
|
|||||||
Thread.sleep(1000);
|
Thread.sleep(1000);
|
||||||
}
|
}
|
||||||
catch (InterruptedException e1) {
|
catch (InterruptedException e1) {
|
||||||
throw Throwables.propagate(e1);
|
Throwables.throwIfUnchecked(e1);
|
||||||
|
throw new RuntimeException(e1);
|
||||||
}
|
}
|
||||||
fetchBrokerRuntimeStats(brokerAddr, retryTime - 1);
|
fetchBrokerRuntimeStats(brokerAddr, retryTime - 1);
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -197,7 +201,8 @@ public class DashboardCollectTask {
|
|||||||
|
|
||||||
}
|
}
|
||||||
catch (IOException e) {
|
catch (IOException e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -250,7 +255,7 @@ public class DashboardCollectTask {
|
|||||||
|
|
||||||
private void addSystemTopic() throws Exception {
|
private void addSystemTopic() throws Exception {
|
||||||
ClusterInfo clusterInfo = mqAdminExt.examineBrokerClusterInfo();
|
ClusterInfo clusterInfo = mqAdminExt.examineBrokerClusterInfo();
|
||||||
HashMap<String, Set<String>> clusterTable = clusterInfo.getClusterAddrTable();
|
Map<String, Set<String>> clusterTable = clusterInfo.getClusterAddrTable();
|
||||||
for (Map.Entry<String, Set<String>> entry : clusterTable.entrySet()) {
|
for (Map.Entry<String, Set<String>> entry : clusterTable.entrySet()) {
|
||||||
String clusterName = entry.getKey();
|
String clusterName = entry.getKey();
|
||||||
TopicValidator.addSystemTopic(clusterName);
|
TopicValidator.addSystemTopic(clusterName);
|
||||||
|
|||||||
@@ -50,7 +50,14 @@
|
|||||||
<td class="text-center">{{instance.address}}</td>
|
<td class="text-center">{{instance.address}}</td>
|
||||||
<td class="text-center">{{instance.brokerVersionDesc}}</td>
|
<td class="text-center">{{instance.brokerVersionDesc}}</td>
|
||||||
<td class="text-center">{{instance.putTps.split(' ')[0]| number:2}}</td>
|
<td class="text-center">{{instance.putTps.split(' ')[0]| number:2}}</td>
|
||||||
<td class="text-center">{{instance.getTransferedTps.split(' ')[0]| number:2}}</td>
|
<td class="text-center">
|
||||||
|
<span ng-if="!instance.getTransferedTps || !instance.getTransferedTps.trim()">
|
||||||
|
{{instance.getTransferredTps.split(' ')[0] | number:2}}
|
||||||
|
</span>
|
||||||
|
<span ng-if="instance.getTransferedTps && instance.getTransferedTps.trim()">
|
||||||
|
{{instance.getTransferedTps.split(' ')[0] | number:2}}
|
||||||
|
</span>
|
||||||
|
</td>
|
||||||
<td class="text-center">{{instance.msgPutTotalTodayMorning -
|
<td class="text-center">{{instance.msgPutTotalTodayMorning -
|
||||||
instance.msgPutTotalYesterdayMorning}}
|
instance.msgPutTotalYesterdayMorning}}
|
||||||
</td>
|
</td>
|
||||||
|
|||||||
@@ -34,27 +34,27 @@ import org.apache.rocketmq.client.impl.MQClientAPIImpl;
|
|||||||
import org.apache.rocketmq.client.impl.factory.MQClientInstance;
|
import org.apache.rocketmq.client.impl.factory.MQClientInstance;
|
||||||
import org.apache.rocketmq.common.PlainAccessConfig;
|
import org.apache.rocketmq.common.PlainAccessConfig;
|
||||||
import org.apache.rocketmq.common.TopicConfig;
|
import org.apache.rocketmq.common.TopicConfig;
|
||||||
import org.apache.rocketmq.common.admin.ConsumeStats;
|
import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
|
||||||
import org.apache.rocketmq.common.admin.RollbackStats;
|
import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
|
||||||
import org.apache.rocketmq.common.admin.TopicStatsTable;
|
import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
|
||||||
import org.apache.rocketmq.common.message.MessageExt;
|
import org.apache.rocketmq.common.message.MessageExt;
|
||||||
import org.apache.rocketmq.common.message.MessageQueue;
|
import org.apache.rocketmq.common.message.MessageQueue;
|
||||||
import org.apache.rocketmq.common.protocol.ResponseCode;
|
import org.apache.rocketmq.remoting.protocol.ResponseCode;
|
||||||
import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
|
import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumeStatsList;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumeStatsList;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.GroupList;
|
import org.apache.rocketmq.remoting.protocol.body.GroupList;
|
||||||
import org.apache.rocketmq.common.protocol.body.KVTable;
|
import org.apache.rocketmq.remoting.protocol.body.KVTable;
|
||||||
import org.apache.rocketmq.common.protocol.body.ProducerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
|
||||||
import org.apache.rocketmq.common.protocol.body.QueueTimeSpan;
|
import org.apache.rocketmq.remoting.protocol.body.QueueTimeSpan;
|
||||||
import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
|
import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
|
||||||
import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper;
|
import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper;
|
||||||
import org.apache.rocketmq.common.protocol.body.TopicList;
|
import org.apache.rocketmq.remoting.protocol.body.TopicList;
|
||||||
import org.apache.rocketmq.common.protocol.route.TopicRouteData;
|
import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
|
||||||
import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
|
import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
|
||||||
import org.apache.rocketmq.dashboard.service.client.MQAdminExtImpl;
|
import org.apache.rocketmq.dashboard.service.client.MQAdminExtImpl;
|
||||||
import org.apache.rocketmq.dashboard.service.client.MQAdminInstance;
|
import org.apache.rocketmq.dashboard.service.client.MQAdminInstance;
|
||||||
import org.apache.rocketmq.dashboard.util.MockObjectUtil;
|
import org.apache.rocketmq.dashboard.util.MockObjectUtil;
|
||||||
@@ -82,6 +82,7 @@ import static org.mockito.ArgumentMatchers.any;
|
|||||||
import static org.mockito.ArgumentMatchers.anyBoolean;
|
import static org.mockito.ArgumentMatchers.anyBoolean;
|
||||||
import static org.mockito.ArgumentMatchers.anyInt;
|
import static org.mockito.ArgumentMatchers.anyInt;
|
||||||
import static org.mockito.ArgumentMatchers.anyLong;
|
import static org.mockito.ArgumentMatchers.anyLong;
|
||||||
|
import static org.mockito.ArgumentMatchers.anyMap;
|
||||||
import static org.mockito.ArgumentMatchers.anyString;
|
import static org.mockito.ArgumentMatchers.anyString;
|
||||||
import static org.mockito.Mockito.doNothing;
|
import static org.mockito.Mockito.doNothing;
|
||||||
import static org.mockito.Mockito.mock;
|
import static org.mockito.Mockito.mock;
|
||||||
@@ -570,11 +571,13 @@ public class MQAdminExtImplTest {
|
|||||||
public void testCreateTopic() throws Exception {
|
public void testCreateTopic() throws Exception {
|
||||||
assertNotNull(mqAdminExtImpl);
|
assertNotNull(mqAdminExtImpl);
|
||||||
{
|
{
|
||||||
doNothing().when(defaultMQAdminExt).createTopic(anyString(), anyString(), anyInt());
|
doNothing().when(defaultMQAdminExt).createTopic(anyString(), anyString(), anyInt(), anyMap());
|
||||||
doNothing().when(defaultMQAdminExt).createTopic(anyString(), anyString(), anyInt(), anyInt());
|
doNothing().when(defaultMQAdminExt).createTopic(anyString(), anyString(), anyInt(), anyInt(), anyMap());
|
||||||
}
|
}
|
||||||
mqAdminExtImpl.createTopic("key", "topic_test", 8);
|
Map<String, String> map = new HashMap<>();
|
||||||
mqAdminExtImpl.createTopic("key", "topic_test", 8, 1);
|
map.put("message.type", "FIFO");
|
||||||
|
mqAdminExtImpl.createTopic("key", "topic_test", 8, map);
|
||||||
|
mqAdminExtImpl.createTopic("key", "topic_test", 8, 1, map);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ package org.apache.rocketmq.dashboard.admin;
|
|||||||
|
|
||||||
import org.apache.commons.pool2.PooledObject;
|
import org.apache.commons.pool2.PooledObject;
|
||||||
import org.apache.commons.pool2.impl.GenericObjectPool;
|
import org.apache.commons.pool2.impl.GenericObjectPool;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.dashboard.config.RMQConfigure;
|
import org.apache.rocketmq.dashboard.config.RMQConfigure;
|
||||||
import org.apache.rocketmq.dashboard.util.MockObjectUtil;
|
import org.apache.rocketmq.dashboard.util.MockObjectUtil;
|
||||||
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
import org.apache.rocketmq.tools.admin.MQAdminExt;
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ import com.google.common.collect.Lists;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.apache.rocketmq.common.AclConfig;
|
import org.apache.rocketmq.common.AclConfig;
|
||||||
import org.apache.rocketmq.common.PlainAccessConfig;
|
import org.apache.rocketmq.common.PlainAccessConfig;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.dashboard.model.request.AclRequest;
|
import org.apache.rocketmq.dashboard.model.request.AclRequest;
|
||||||
import org.apache.rocketmq.dashboard.service.impl.AclServiceImpl;
|
import org.apache.rocketmq.dashboard.service.impl.AclServiceImpl;
|
||||||
import org.apache.rocketmq.dashboard.util.MockObjectUtil;
|
import org.apache.rocketmq.dashboard.util.MockObjectUtil;
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ package org.apache.rocketmq.dashboard.controller;
|
|||||||
|
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.KVTable;
|
import org.apache.rocketmq.remoting.protocol.body.KVTable;
|
||||||
import org.apache.rocketmq.dashboard.service.impl.ClusterServiceImpl;
|
import org.apache.rocketmq.dashboard.service.impl.ClusterServiceImpl;
|
||||||
import org.apache.rocketmq.dashboard.util.MockObjectUtil;
|
import org.apache.rocketmq.dashboard.util.MockObjectUtil;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
|
|||||||
@@ -23,17 +23,17 @@ import java.util.HashMap;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import org.apache.rocketmq.client.exception.MQClientException;
|
import org.apache.rocketmq.client.exception.MQClientException;
|
||||||
import org.apache.rocketmq.common.admin.ConsumeStats;
|
import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
|
||||||
import org.apache.rocketmq.common.admin.RollbackStats;
|
import org.apache.rocketmq.remoting.protocol.admin.RollbackStats;
|
||||||
import org.apache.rocketmq.common.message.MessageQueue;
|
import org.apache.rocketmq.common.message.MessageQueue;
|
||||||
import org.apache.rocketmq.common.protocol.ResponseCode;
|
import org.apache.rocketmq.remoting.protocol.ResponseCode;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
|
import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
|
||||||
import org.apache.rocketmq.common.protocol.heartbeat.ConsumeType;
|
import org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType;
|
||||||
import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
|
import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
|
||||||
import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
|
import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
|
||||||
import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
|
import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
|
||||||
import org.apache.rocketmq.dashboard.model.request.DeleteSubGroupRequest;
|
import org.apache.rocketmq.dashboard.model.request.DeleteSubGroupRequest;
|
||||||
import org.apache.rocketmq.dashboard.model.request.ResetOffsetRequest;
|
import org.apache.rocketmq.dashboard.model.request.ResetOffsetRequest;
|
||||||
@@ -67,6 +67,7 @@ public class ConsumerControllerTest extends BaseControllerTest {
|
|||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void init() throws Exception {
|
public void init() throws Exception {
|
||||||
|
consumerService.afterPropertiesSet();
|
||||||
super.mockRmqConfigure();
|
super.mockRmqConfigure();
|
||||||
ClusterInfo clusterInfo = MockObjectUtil.createClusterInfo();
|
ClusterInfo clusterInfo = MockObjectUtil.createClusterInfo();
|
||||||
when(mqAdminExt.examineBrokerClusterInfo()).thenReturn(clusterInfo);
|
when(mqAdminExt.examineBrokerClusterInfo()).thenReturn(clusterInfo);
|
||||||
@@ -93,9 +94,10 @@ public class ConsumerControllerTest extends BaseControllerTest {
|
|||||||
perform = mockMvc.perform(requestBuilder);
|
perform = mockMvc.perform(requestBuilder);
|
||||||
perform.andExpect(status().isOk())
|
perform.andExpect(status().isOk())
|
||||||
.andExpect(jsonPath("$.data", hasSize(2)))
|
.andExpect(jsonPath("$.data", hasSize(2)))
|
||||||
.andExpect(jsonPath("$.data[0].group").value("group_test"))
|
|
||||||
.andExpect(jsonPath("$.data[0].consumeType").value(ConsumeType.CONSUME_ACTIVELY.name()))
|
.andExpect(jsonPath("$.data[0].consumeType").value(ConsumeType.CONSUME_ACTIVELY.name()))
|
||||||
.andExpect(jsonPath("$.data[0].messageModel").value(MessageModel.CLUSTERING.name()));
|
.andExpect(jsonPath("$.data[0].messageModel").value(MessageModel.CLUSTERING.name()));
|
||||||
|
// executorService shutdown
|
||||||
|
consumerService.destroy();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|||||||
@@ -21,10 +21,10 @@ import com.google.common.collect.Lists;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import org.apache.rocketmq.client.exception.MQClientException;
|
import org.apache.rocketmq.client.exception.MQClientException;
|
||||||
import org.apache.rocketmq.common.MixAll;
|
import org.apache.rocketmq.common.MixAll;
|
||||||
import org.apache.rocketmq.common.protocol.ResponseCode;
|
import org.apache.rocketmq.remoting.protocol.ResponseCode;
|
||||||
import org.apache.rocketmq.common.protocol.body.CMResult;
|
import org.apache.rocketmq.remoting.protocol.body.CMResult;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
|
||||||
import org.apache.rocketmq.common.protocol.route.TopicRouteData;
|
import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
|
||||||
import org.apache.rocketmq.dashboard.model.DlqMessageRequest;
|
import org.apache.rocketmq.dashboard.model.DlqMessageRequest;
|
||||||
import org.apache.rocketmq.dashboard.model.MessagePage;
|
import org.apache.rocketmq.dashboard.model.MessagePage;
|
||||||
import org.apache.rocketmq.dashboard.model.MessageView;
|
import org.apache.rocketmq.dashboard.model.MessageView;
|
||||||
|
|||||||
@@ -32,9 +32,9 @@ import org.apache.rocketmq.client.exception.MQClientException;
|
|||||||
import org.apache.rocketmq.common.message.MessageClientIDSetter;
|
import org.apache.rocketmq.common.message.MessageClientIDSetter;
|
||||||
import org.apache.rocketmq.common.message.MessageExt;
|
import org.apache.rocketmq.common.message.MessageExt;
|
||||||
import org.apache.rocketmq.common.message.MessageQueue;
|
import org.apache.rocketmq.common.message.MessageQueue;
|
||||||
import org.apache.rocketmq.common.protocol.body.CMResult;
|
import org.apache.rocketmq.remoting.protocol.body.CMResult;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumeMessageDirectlyResult;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumeMessageDirectlyResult;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
|
||||||
import org.apache.rocketmq.dashboard.model.QueueOffsetInfo;
|
import org.apache.rocketmq.dashboard.model.QueueOffsetInfo;
|
||||||
import org.apache.rocketmq.dashboard.model.request.MessageQuery;
|
import org.apache.rocketmq.dashboard.model.request.MessageQuery;
|
||||||
import org.apache.rocketmq.dashboard.service.impl.MessageServiceImpl;
|
import org.apache.rocketmq.dashboard.service.impl.MessageServiceImpl;
|
||||||
|
|||||||
@@ -19,8 +19,8 @@ package org.apache.rocketmq.dashboard.controller;
|
|||||||
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import org.apache.rocketmq.client.exception.MQClientException;
|
import org.apache.rocketmq.client.exception.MQClientException;
|
||||||
import org.apache.rocketmq.common.protocol.body.Connection;
|
import org.apache.rocketmq.remoting.protocol.body.Connection;
|
||||||
import org.apache.rocketmq.common.protocol.body.ProducerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ProducerConnection;
|
||||||
import org.apache.rocketmq.dashboard.interceptor.AuthInterceptor;
|
import org.apache.rocketmq.dashboard.interceptor.AuthInterceptor;
|
||||||
import org.apache.rocketmq.dashboard.service.impl.LoginServiceImpl;
|
import org.apache.rocketmq.dashboard.service.impl.LoginServiceImpl;
|
||||||
import org.apache.rocketmq.dashboard.service.impl.ProducerServiceImpl;
|
import org.apache.rocketmq.dashboard.service.impl.ProducerServiceImpl;
|
||||||
|
|||||||
@@ -29,16 +29,16 @@ import org.apache.rocketmq.client.producer.DefaultMQProducer;
|
|||||||
import org.apache.rocketmq.client.producer.SendResult;
|
import org.apache.rocketmq.client.producer.SendResult;
|
||||||
import org.apache.rocketmq.client.producer.SendStatus;
|
import org.apache.rocketmq.client.producer.SendStatus;
|
||||||
import org.apache.rocketmq.common.TopicConfig;
|
import org.apache.rocketmq.common.TopicConfig;
|
||||||
import org.apache.rocketmq.common.admin.ConsumeStats;
|
import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
|
||||||
import org.apache.rocketmq.common.admin.TopicStatsTable;
|
import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
|
||||||
import org.apache.rocketmq.common.message.Message;
|
import org.apache.rocketmq.common.message.Message;
|
||||||
import org.apache.rocketmq.common.message.MessageQueue;
|
import org.apache.rocketmq.common.message.MessageQueue;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.GroupList;
|
import org.apache.rocketmq.remoting.protocol.body.GroupList;
|
||||||
import org.apache.rocketmq.common.protocol.body.TopicList;
|
import org.apache.rocketmq.remoting.protocol.body.TopicList;
|
||||||
import org.apache.rocketmq.common.protocol.route.TopicRouteData;
|
import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
|
||||||
import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
|
import org.apache.rocketmq.dashboard.model.request.SendTopicMessageRequest;
|
||||||
import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
|
import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
|
||||||
import org.apache.rocketmq.dashboard.service.impl.ConsumerServiceImpl;
|
import org.apache.rocketmq.dashboard.service.impl.ConsumerServiceImpl;
|
||||||
|
|||||||
@@ -33,12 +33,12 @@ import java.util.Set;
|
|||||||
import java.util.concurrent.ExecutorService;
|
import java.util.concurrent.ExecutorService;
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import org.apache.rocketmq.common.MixAll;
|
import org.apache.rocketmq.common.MixAll;
|
||||||
import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
|
import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.GroupList;
|
import org.apache.rocketmq.remoting.protocol.body.GroupList;
|
||||||
import org.apache.rocketmq.common.protocol.body.KVTable;
|
import org.apache.rocketmq.remoting.protocol.body.KVTable;
|
||||||
import org.apache.rocketmq.common.protocol.body.TopicList;
|
import org.apache.rocketmq.remoting.protocol.body.TopicList;
|
||||||
import org.apache.rocketmq.common.protocol.route.TopicRouteData;
|
import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
|
||||||
import org.apache.rocketmq.dashboard.BaseTest;
|
import org.apache.rocketmq.dashboard.BaseTest;
|
||||||
import org.apache.rocketmq.dashboard.config.CollectExecutorConfig;
|
import org.apache.rocketmq.dashboard.config.CollectExecutorConfig;
|
||||||
import org.apache.rocketmq.dashboard.config.RMQConfigure;
|
import org.apache.rocketmq.dashboard.config.RMQConfigure;
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import org.apache.rocketmq.client.producer.SendResult;
|
|||||||
import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
|
import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
|
||||||
import org.apache.rocketmq.common.message.Message;
|
import org.apache.rocketmq.common.message.Message;
|
||||||
import org.apache.rocketmq.common.message.MessageExt;
|
import org.apache.rocketmq.common.message.MessageExt;
|
||||||
import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
|
import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
|
||||||
import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
|
import org.apache.rocketmq.dashboard.model.request.ConsumerConfigInfo;
|
||||||
import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
|
import org.apache.rocketmq.dashboard.model.request.TopicConfigInfo;
|
||||||
import org.apache.rocketmq.dashboard.service.ConsumerService;
|
import org.apache.rocketmq.dashboard.service.ConsumerService;
|
||||||
@@ -78,7 +78,8 @@ public abstract class RocketMQConsoleTestBase {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
throw Throwables.propagate(exception);
|
Throwables.throwIfUnchecked(exception);
|
||||||
|
throw new RuntimeException(exception);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -91,7 +92,8 @@ public abstract class RocketMQConsoleTestBase {
|
|||||||
producer.start();
|
producer.start();
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,7 +139,8 @@ public abstract class RocketMQConsoleTestBase {
|
|||||||
consumer.start();
|
consumer.start();
|
||||||
}
|
}
|
||||||
catch (Exception e) {
|
catch (Exception e) {
|
||||||
throw Throwables.propagate(e);
|
Throwables.throwIfUnchecked(e);
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -33,39 +33,39 @@ import org.apache.rocketmq.client.producer.LocalTransactionState;
|
|||||||
import org.apache.rocketmq.client.trace.TraceConstants;
|
import org.apache.rocketmq.client.trace.TraceConstants;
|
||||||
import org.apache.rocketmq.client.trace.TraceType;
|
import org.apache.rocketmq.client.trace.TraceType;
|
||||||
import org.apache.rocketmq.common.AclConfig;
|
import org.apache.rocketmq.common.AclConfig;
|
||||||
import org.apache.rocketmq.common.DataVersion;
|
import org.apache.rocketmq.remoting.protocol.DataVersion;
|
||||||
import org.apache.rocketmq.common.MixAll;
|
import org.apache.rocketmq.common.MixAll;
|
||||||
import org.apache.rocketmq.common.PlainAccessConfig;
|
import org.apache.rocketmq.common.PlainAccessConfig;
|
||||||
import org.apache.rocketmq.common.TopicConfig;
|
import org.apache.rocketmq.common.TopicConfig;
|
||||||
import org.apache.rocketmq.common.admin.ConsumeStats;
|
import org.apache.rocketmq.remoting.protocol.admin.ConsumeStats;
|
||||||
import org.apache.rocketmq.common.admin.OffsetWrapper;
|
import org.apache.rocketmq.remoting.protocol.admin.OffsetWrapper;
|
||||||
import org.apache.rocketmq.common.admin.TopicOffset;
|
import org.apache.rocketmq.remoting.protocol.admin.TopicOffset;
|
||||||
import org.apache.rocketmq.common.admin.TopicStatsTable;
|
import org.apache.rocketmq.remoting.protocol.admin.TopicStatsTable;
|
||||||
import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
|
import org.apache.rocketmq.common.consumer.ConsumeFromWhere;
|
||||||
import org.apache.rocketmq.common.message.MessageExt;
|
import org.apache.rocketmq.common.message.MessageExt;
|
||||||
import org.apache.rocketmq.common.message.MessageQueue;
|
import org.apache.rocketmq.common.message.MessageQueue;
|
||||||
import org.apache.rocketmq.common.protocol.body.BrokerStatsData;
|
import org.apache.rocketmq.remoting.protocol.body.BrokerStatsData;
|
||||||
import org.apache.rocketmq.common.protocol.body.BrokerStatsItem;
|
import org.apache.rocketmq.remoting.protocol.body.BrokerStatsItem;
|
||||||
import org.apache.rocketmq.common.protocol.body.ClusterInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ClusterInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.Connection;
|
import org.apache.rocketmq.remoting.protocol.body.Connection;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumeStatus;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumeStatus;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerConnection;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerConnection;
|
||||||
import org.apache.rocketmq.common.protocol.body.ConsumerRunningInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ConsumerRunningInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.ProcessQueueInfo;
|
import org.apache.rocketmq.remoting.protocol.body.ProcessQueueInfo;
|
||||||
import org.apache.rocketmq.common.protocol.body.SubscriptionGroupWrapper;
|
import org.apache.rocketmq.remoting.protocol.body.SubscriptionGroupWrapper;
|
||||||
import org.apache.rocketmq.common.protocol.body.TopicConfigSerializeWrapper;
|
import org.apache.rocketmq.remoting.protocol.body.TopicConfigSerializeWrapper;
|
||||||
import org.apache.rocketmq.common.protocol.heartbeat.ConsumeType;
|
import org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType;
|
||||||
import org.apache.rocketmq.common.protocol.heartbeat.MessageModel;
|
import org.apache.rocketmq.remoting.protocol.heartbeat.MessageModel;
|
||||||
import org.apache.rocketmq.common.protocol.heartbeat.SubscriptionData;
|
import org.apache.rocketmq.remoting.protocol.heartbeat.SubscriptionData;
|
||||||
import org.apache.rocketmq.common.protocol.route.BrokerData;
|
import org.apache.rocketmq.remoting.protocol.route.BrokerData;
|
||||||
import org.apache.rocketmq.common.protocol.route.QueueData;
|
import org.apache.rocketmq.remoting.protocol.route.QueueData;
|
||||||
import org.apache.rocketmq.common.protocol.route.TopicRouteData;
|
import org.apache.rocketmq.remoting.protocol.route.TopicRouteData;
|
||||||
import org.apache.rocketmq.common.subscription.SubscriptionGroupConfig;
|
import org.apache.rocketmq.remoting.protocol.subscription.SubscriptionGroupConfig;
|
||||||
import org.apache.rocketmq.dashboard.model.DlqMessageRequest;
|
import org.apache.rocketmq.dashboard.model.DlqMessageRequest;
|
||||||
import org.apache.rocketmq.remoting.protocol.LanguageCode;
|
import org.apache.rocketmq.remoting.protocol.LanguageCode;
|
||||||
import org.checkerframework.checker.units.qual.A;
|
import org.checkerframework.checker.units.qual.A;
|
||||||
|
|
||||||
import static org.apache.rocketmq.common.protocol.heartbeat.ConsumeType.CONSUME_ACTIVELY;
|
import static org.apache.rocketmq.remoting.protocol.heartbeat.ConsumeType.CONSUME_ACTIVELY;
|
||||||
|
|
||||||
public class MockObjectUtil {
|
public class MockObjectUtil {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user