Skip to content

Commit

Permalink
Revert "build: don't add nonexistent directory 'lib' to relocatable p…
Browse files Browse the repository at this point in the history
…ackages"

This reverts commit 82e3d0c.

the "lib" directory is not empty, and it collects all the runtime dependencies
for running the java-based nodetool. without them, we'd run into test failures
when testing dtests using the java-based nodetool:

```
>           raise ToolError(cmd_args, rc, out, err)
E           ccmlib.node.ToolError: Subprocess ['stress', 'write', 'n=50K', '-rate', 'threads=4', '-node', '127.0.96.1'] exited with non-zero status; exit status: 1;
E           stderr: Exception in thread "main" java.lang.NoClassDefFoundError: io/netty/util/concurrent/FastThreadLocal
E           	at org.apache.cassandra.stress.Stress.main(Stress.java:59)
E           Caused by: java.lang.ClassNotFoundException: io.netty.util.concurrent.FastThreadLocal
E           	at java.base/jdk.internal.loader.BuiltinClassLoader.loadClass(BuiltinClassLoader.java:581)
E           	at java.base/jdk.internal.loader.ClassLoaders$AppClassLoader.loadClass(ClassLoaders.java:178)
E           	at java.base/java.lang.ClassLoader.loadClass(ClassLoader.java:527)
E           	... 1 more
```

Closes: #397
  • Loading branch information
tchaikov authored and denesb committed Jun 11, 2024
1 parent 76a2682 commit 01ba3c1
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions scripts/create-relocatable-package.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ def reloc_add(self, name, arcname=None, recursive=True, *, filter=None):
ar.reloc_add('conf')
ar.reloc_add('bin')
ar.reloc_add('tools')
ar.reloc_add('lib')
ar.reloc_add('doc')
ar.reloc_add('install.sh')
ar.reloc_add('build/apache-cassandra-{}.jar'.format(version), arcname='lib/apache-cassandra-{}.jar'.format(version))
Expand Down

0 comments on commit 01ba3c1

Please sign in to comment.