Skip to content

Commit

Permalink
fix(merge): fix storage auto format
Browse files Browse the repository at this point in the history
Signed-off-by: Robin Han <[email protected]>
  • Loading branch information
superhx committed Aug 15, 2024
1 parent baafb4a commit cf8ef53
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 145 deletions.
2 changes: 1 addition & 1 deletion core/src/main/java/kafka/automq/StorageUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static void formatStorage(Properties serverProps) {
String metadataLog = new KafkaConfig(serverProps, false).metadataLogDir();
if (!Files.exists(Paths.get(metadataLog, "meta.properties"))) {
String configFilePath = persistConfig(serverProps, metadataLog);
StorageTool.main(new String[] {"auto-format", "-t", clusterId, "-c=" + configFilePath});
StorageTool.execute(new String[] {"format", "-t", clusterId, "-c=" + configFilePath});
} else {
persistConfig(serverProps, metadataLog);
}
Expand Down
145 changes: 1 addition & 144 deletions licenses/APL
Original file line number Diff line number Diff line change
Expand Up @@ -199,147 +199,4 @@
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

-------------------------------------------------------------------------------
This project bundles some components that are also licensed under the Apache
License Version 2.0:

audience-annotations-0.12.0
caffeine-2.9.3
commons-beanutils-1.9.4
commons-cli-1.4
commons-collections-3.2.2
commons-digester-2.1
commons-io-2.11.0
commons-lang3-3.12.0
commons-logging-1.2
commons-validator-1.7
error_prone_annotations-2.10.0
jackson-annotations-2.16.2
jackson-core-2.16.2
jackson-databind-2.16.2
jackson-dataformat-csv-2.16.2
jackson-datatype-jdk8-2.16.2
jackson-jaxrs-base-2.16.2
jackson-jaxrs-json-provider-2.16.2
jackson-module-afterburner-2.16.2
jackson-module-jaxb-annotations-2.16.2
jackson-module-scala_2.13-2.16.2
jackson-module-scala_2.12-2.16.2
jakarta.validation-api-2.0.2
javassist-3.29.2-GA
jetty-client-9.4.54.v20240208
jetty-continuation-9.4.54.v20240208
jetty-http-9.4.54.v20240208
jetty-io-9.4.54.v20240208
jetty-security-9.4.54.v20240208
jetty-server-9.4.54.v20240208
jetty-servlet-9.4.54.v20240208
jetty-servlets-9.4.54.v20240208
jetty-util-9.4.54.v20240208
jetty-util-ajax-9.4.54.v20240208
jose4j-0.9.4
lz4-java-1.8.0
maven-artifact-3.9.6
metrics-core-4.1.12.1
metrics-core-2.2.0
netty-buffer-4.1.110.Final
netty-codec-4.1.110.Final
netty-common-4.1.110.Final
netty-handler-4.1.110.Final
netty-resolver-4.1.110.Final
netty-transport-4.1.110.Final
netty-transport-classes-epoll-4.1.110.Final
netty-transport-native-epoll-4.1.110.Final
netty-transport-native-unix-common-4.1.110.Final
opentelemetry-proto-1.0.0-alpha
plexus-utils-3.5.1
reflections-0.10.2
reload4j-1.2.25
rocksdbjni-7.9.2
scala-collection-compat_2.12-2.10.0
scala-collection-compat_2.13-2.10.0
scala-library-2.12.19
scala-library-2.13.14
scala-logging_2.12-3.9.4
scala-logging_2.13-3.9.4
scala-reflect-2.12.19
scala-reflect-2.13.14
scala-java8-compat_2.12-1.0.2
scala-java8-compat_2.13-1.0.2
snappy-java-1.1.10.5
swagger-annotations-2.2.8
zookeeper-3.8.4
zookeeper-jute-3.8.4

===============================================================================
This product bundles various third-party components under other open source
licenses. This section summarizes those components and their licenses.
See licenses/ for text of these licenses.

---------------------------------------
Eclipse Distribution License - v 1.0
see: licenses/eclipse-distribution-license-1.0

jakarta.activation-api-1.2.2
jakarta.xml.bind-api-2.3.3

---------------------------------------
Eclipse Public License - v 2.0
see: licenses/eclipse-public-license-2.0

jakarta.annotation-api-1.3.5
jakarta.ws.rs-api-2.1.6
hk2-api-2.6.1
hk2-locator-2.6.1
hk2-utils-2.6.1
osgi-resource-locator-1.0.3
aopalliance-repackaged-2.6.1
jakarta.inject-2.6.1
jersey-client-2.39.1
jersey-common-2.39.1
jersey-container-servlet-2.39.1
jersey-container-servlet-core-2.39.1
jersey-hk2-2.39.1
jersey-server-2.39.1

---------------------------------------
CDDL 1.1 + GPLv2 with classpath exception
see: licenses/CDDL+GPL-1.1

javax.activation-api-1.2.0
javax.annotation-api-1.3.2
javax.servlet-api-3.1.0
javax.ws.rs-api-2.1.1
jaxb-api-2.3.1
activation-1.1.1

---------------------------------------
MIT License

argparse4j-0.7.0, see: licenses/argparse-MIT
checker-qual-3.19.0, see: licenses/checker-qual-MIT
jopt-simple-5.0.4, see: licenses/jopt-simple-MIT
slf4j-api-1.7.36, see: licenses/slf4j-MIT
slf4j-reload4j-1.7.36, see: licenses/slf4j-MIT
pcollections-4.0.1, see: licenses/pcollections-MIT

---------------------------------------
BSD 2-Clause

zstd-jni-1.5.6-3 see: licenses/zstd-jni-BSD-2-clause

---------------------------------------
BSD 3-Clause

jline-3.25.1, see: licenses/jline-BSD-3-clause
jsr305-3.0.2, see: licenses/jsr305-BSD-3-clause
paranamer-2.8, see: licenses/paranamer-BSD-3-clause
protobuf-java-3.23.4, see: licenses/protobuf-java-BSD-3-clause

---------------------------------------
Do What The F*ck You Want To Public License
see: licenses/DWTFYWTPL

reflections-0.10.2
limitations under the License.

0 comments on commit cf8ef53

Please sign in to comment.