mirror of
https://github.com/openjdk/jdk.git
synced 2026-02-08 01:25:31 +00:00
7146543: TEST_BUG: java/rmi/registry/readTest/readTest.sh failing intermittently with port in use
Reviewed-by: rriggs
This commit is contained in:
Hamlin Li
parent
eeb1e36d49
commit
cf65663c4d
@ -1,6 +1,6 @@
|
||||
###########################################################################
|
||||
#
|
||||
# Copyright (c) 2009, 2016, Oracle and/or its affiliates. All rights reserved.
|
||||
# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
@ -203,8 +203,6 @@ java/rmi/activation/Activatable/extLoadedImpl/ext.sh 8062724 generic-
|
||||
|
||||
sun/rmi/rmic/newrmic/equivalence/run.sh 8145980 generic-all
|
||||
|
||||
java/rmi/registry/readTest/readTest.sh 7146543 generic-all
|
||||
|
||||
############################################################################
|
||||
|
||||
# jdk_security
|
||||
|
||||
90
jdk/test/java/rmi/registry/readTest/CodebaseTest.java
Normal file
90
jdk/test/java/rmi/registry/readTest/CodebaseTest.java
Normal file
@ -0,0 +1,90 @@
|
||||
/*
|
||||
* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License version 2 only, as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* version 2 for more details (a copy is included in the LICENSE file that
|
||||
* accompanied this code).
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License version
|
||||
* 2 along with this work; if not, write to the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
*
|
||||
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
* or visit www.oracle.com if you need additional information or have any
|
||||
* questions.
|
||||
*/
|
||||
|
||||
/* @test
|
||||
* @bug 7102369 7094468 7100592
|
||||
* @modules java.rmi/sun.rmi.registry
|
||||
* java.rmi/sun.rmi.server
|
||||
* java.rmi/sun.rmi.transport
|
||||
* java.rmi/sun.rmi.transport.tcp
|
||||
* @library ../../testlibrary
|
||||
* @build TestLibrary RMIRegistryRunner RegistryVM JavaVM testPkg.* RegistryLookup
|
||||
* @summary remove java.rmi.server.codebase property parsing from registyimpl
|
||||
* @run main/othervm CodebaseTest
|
||||
*/
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.rmi.registry.Registry;
|
||||
import java.rmi.registry.LocateRegistry;
|
||||
import java.rmi.RemoteException;
|
||||
import java.rmi.server.UnicastRemoteObject;
|
||||
|
||||
public class CodebaseTest {
|
||||
|
||||
public static void main(String args[]) throws Exception {
|
||||
RegistryVM rmiregistry = null;
|
||||
JavaVM client = null;
|
||||
try {
|
||||
File src = new File(System.getProperty("test.classes", "."), "testPkg");
|
||||
File dest = new File(System.getProperty("user.dir", "."), "testPkg");
|
||||
Files.move(src.toPath(), dest.toPath(),
|
||||
StandardCopyOption.REPLACE_EXISTING);
|
||||
|
||||
File rmiregistryDir =
|
||||
new File(System.getProperty("user.dir", "."), "rmi_tmp");
|
||||
rmiregistryDir.mkdirs();
|
||||
rmiregistry = RegistryVM.createRegistryVMWithRunner(
|
||||
"RMIRegistryRunner",
|
||||
" -Djava.rmi.server.useCodebaseOnly=false"
|
||||
+ " -Duser.dir=" + rmiregistryDir.getAbsolutePath());
|
||||
rmiregistry.start();
|
||||
int port = rmiregistry.getPort();
|
||||
|
||||
File srcReadTest = new File(System.getProperty("test.classes", "."),
|
||||
"RegistryLookup.class");
|
||||
File destReadTest = new File(System.getProperty("user.dir", "."),
|
||||
"RegistryLookup.class");
|
||||
Files.move(srcReadTest.toPath(), destReadTest.toPath(),
|
||||
StandardCopyOption.REPLACE_EXISTING);
|
||||
|
||||
File codebase = new File(System.getProperty("user.dir", "."));
|
||||
client = new JavaVM("RegistryLookup",
|
||||
" -Djava.rmi.server.codebase=" + codebase.toURI().toURL()
|
||||
+ " -cp ." + File.pathSeparator + System.getProperty("test.class.path"),
|
||||
Integer.toString(port));
|
||||
int exit = client.execute();
|
||||
if (exit == RegistryLookup.EXIT_FAIL) {
|
||||
throw new RuntimeException("Test Fails");
|
||||
}
|
||||
} finally {
|
||||
if (rmiregistry != null) {
|
||||
rmiregistry.cleanup();
|
||||
}
|
||||
if (client != null) {
|
||||
client.cleanup();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2011, 2017, Oracle and/or its affiliates. All rights reserved.
|
||||
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
*
|
||||
* This code is free software; you can redistribute it and/or modify it
|
||||
@ -26,34 +26,37 @@ import java.rmi.registry.LocateRegistry;
|
||||
import java.rmi.RemoteException;
|
||||
import java.rmi.server.UnicastRemoteObject;
|
||||
|
||||
public class readTest {
|
||||
public class RegistryLookup {
|
||||
public static final int EXIT_FAIL = 1;
|
||||
|
||||
public static void main(String args[]) throws Exception {
|
||||
Registry registry = null;
|
||||
int exit = 0;
|
||||
try {
|
||||
testPkg.Server obj = new testPkg.Server();
|
||||
testPkg.Hello stub = (testPkg.Hello) UnicastRemoteObject.exportObject(obj, 0);
|
||||
// Bind the remote object's stub in the registry
|
||||
Registry registry =
|
||||
LocateRegistry.getRegistry(TestLibrary.READTEST_REGISTRY_PORT);
|
||||
registry.bind("Hello", stub);
|
||||
int port = Integer.valueOf(args[0]);
|
||||
|
||||
testPkg.Server obj = new testPkg.Server();
|
||||
testPkg.Hello stub =
|
||||
(testPkg.Hello) UnicastRemoteObject.exportObject(obj, 0);
|
||||
// Bind the remote object's stub in the registry
|
||||
registry = LocateRegistry.getRegistry(port);
|
||||
registry.bind("Hello", stub);
|
||||
System.err.println("Server ready");
|
||||
|
||||
// now, let's test client
|
||||
testPkg.Client client =
|
||||
new testPkg.Client(TestLibrary.READTEST_REGISTRY_PORT);
|
||||
testPkg.Client client = new testPkg.Client(port);
|
||||
String testStubReturn = client.testStub();
|
||||
if(!testStubReturn.equals(obj.hello)) {
|
||||
throw new RuntimeException("Test Fails : unexpected string from stub call");
|
||||
} else {
|
||||
System.out.println("Test passed");
|
||||
throw new RuntimeException("Test Fails : "
|
||||
+ "unexpected string from stub call");
|
||||
}
|
||||
registry.unbind("Hello");
|
||||
|
||||
} catch (Exception e) {
|
||||
System.err.println("Server exception: " + e.toString());
|
||||
e.printStackTrace();
|
||||
System.out.println("Test passed");
|
||||
} catch (Exception ex) {
|
||||
exit = EXIT_FAIL;
|
||||
ex.printStackTrace();
|
||||
}
|
||||
|
||||
// need to exit explicitly, and parent process uses exit value
|
||||
// to tell if the test passed.
|
||||
System.exit(exit);
|
||||
}
|
||||
}
|
||||
@ -1,137 +0,0 @@
|
||||
#
|
||||
# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
|
||||
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
|
||||
#
|
||||
# This code is free software; you can redistribute it and/or modify it
|
||||
# under the terms of the GNU General Public License version 2 only, as
|
||||
# published by the Free Software Foundation.
|
||||
#
|
||||
# This code is distributed in the hope that it will be useful, but WITHOUT
|
||||
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
||||
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
# version 2 for more details (a copy is included in the LICENSE file that
|
||||
# accompanied this code).
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License version
|
||||
# 2 along with this work; if not, write to the Free Software Foundation,
|
||||
# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
|
||||
#
|
||||
# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
|
||||
# or visit www.oracle.com if you need additional information or have any
|
||||
# questions.
|
||||
#
|
||||
|
||||
# @test
|
||||
# @bug 7102369 7094468 7100592
|
||||
# @modules java.rmi/sun.rmi.registry
|
||||
# java.rmi/sun.rmi.server
|
||||
# java.rmi/sun.rmi.transport
|
||||
# java.rmi/sun.rmi.transport.tcp
|
||||
# @library ../../testlibrary
|
||||
# @build TestLibrary
|
||||
# @summary remove java.rmi.server.codebase property parsing from registyimpl
|
||||
# @run shell readTest.sh
|
||||
# @key intermittent
|
||||
|
||||
OS=`uname -s`
|
||||
VER=`uname -r`
|
||||
ARGS=""
|
||||
REGARGS=""
|
||||
|
||||
case "$OS" in
|
||||
SunOS | Linux | Darwin | AIX )
|
||||
PS=":"
|
||||
FS="/"
|
||||
CHMOD="${FS}bin${FS}chmod"
|
||||
FILEURL="file:"
|
||||
;;
|
||||
Windows* )
|
||||
PS=";"
|
||||
FS="\\"
|
||||
CHMOD="chmod"
|
||||
FILEURL="file:/"
|
||||
if [ "$VER" -eq "5" ]; then
|
||||
ARGS="-Djdk.net.ephemeralPortRange.low=1024 -Djdk.net.ephemeralPortRange.high=65000"
|
||||
REGARGS="-J-Djdk.net.ephemeralPortRange.low=1024 -J-Djdk.net.ephemeralPortRange.high=65000"
|
||||
fi
|
||||
;;
|
||||
CYGWIN* )
|
||||
PS=";"
|
||||
FS="/"
|
||||
CHMOD="chmod"
|
||||
FILEURL="file:/"
|
||||
if [ "$VER" -eq "5" ]; then
|
||||
ARGS="-Djdk.net.ephemeralPortRange.low=1024 -Djdk.net.ephemeralPortRange.high=65000"
|
||||
REGARGS="-J-Djdk.net.ephemeralPortRange.low=1024 -J-Djdk.net.ephemeralPortRange.high=65000"
|
||||
fi
|
||||
;;
|
||||
* )
|
||||
echo "Unrecognized system!"
|
||||
exit 1;
|
||||
;;
|
||||
esac
|
||||
|
||||
TEST_CLASSPATH=.$PS${TESTCLASSPATH:-$TESTCLASSES}
|
||||
cp -r ${TESTSRC}${FS}* .
|
||||
${CHMOD} -R u+w *
|
||||
${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} testPkg${FS}*java
|
||||
${COMPILEJAVA}${FS}bin${FS}javac ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -cp $TEST_CLASSPATH readTest.java
|
||||
|
||||
mkdir rmi_tmp
|
||||
RMIREG_OUT=rmi.out
|
||||
#start rmiregistry without any local classes on classpath
|
||||
cd rmi_tmp
|
||||
# NOTE: This RMI Registry port must match TestLibrary.READTEST_REGISTRY_PORT
|
||||
${TESTJAVA}${FS}bin${FS}rmiregistry ${REGARGS} -J-Djava.rmi.server.useCodebaseOnly=false \
|
||||
${TESTTOOLVMOPTS} 60005 > ..${FS}${RMIREG_OUT} 2>&1 &
|
||||
RMIREG_PID=$!
|
||||
# allow some time to start
|
||||
sleep 3
|
||||
cd ..
|
||||
|
||||
case "$OS" in
|
||||
CYGWIN* )
|
||||
CODEBASE=`cygpath -w $PWD`
|
||||
;;
|
||||
* )
|
||||
CODEBASE=`pwd`
|
||||
;;
|
||||
esac
|
||||
# trailing / after code base is important for rmi codebase property.
|
||||
TESTVMOPTS="${TESTVMOPTS} \
|
||||
--add-exports java.rmi/sun.rmi.registry=ALL-UNNAMED \
|
||||
--add-exports java.rmi/sun.rmi.server=ALL-UNNAMED \
|
||||
--add-exports java.rmi/sun.rmi.transport=ALL-UNNAMED \
|
||||
--add-exports java.rmi/sun.rmi.transport.tcp=ALL-UNNAMED"
|
||||
${TESTJAVA}${FS}bin${FS}java ${TESTVMOPTS} -cp $TEST_CLASSPATH ${ARGS} -Djava.rmi.server.codebase=${FILEURL}$CODEBASE/ readTest > OUT.TXT 2>&1 &
|
||||
TEST_PID=$!
|
||||
#bulk of testcase - let it run for a while
|
||||
sleep 5
|
||||
|
||||
#we're done, kill processes first
|
||||
kill -9 ${RMIREG_PID} ${TEST_PID}
|
||||
sleep 3
|
||||
|
||||
echo "Test output : "
|
||||
|
||||
cat OUT.TXT
|
||||
echo "=============="
|
||||
echo "rmiregistry output : "
|
||||
cat ${RMIREG_OUT}
|
||||
echo "=============="
|
||||
|
||||
grep "Server ready" OUT.TXT
|
||||
result1=$?
|
||||
grep "Test passed" OUT.TXT
|
||||
result2=$?
|
||||
|
||||
if [ $result1 -eq 0 -a $result2 -eq 0 ]
|
||||
then
|
||||
echo "Passed"
|
||||
exitCode=0;
|
||||
else
|
||||
echo "Failed"
|
||||
exitCode=1
|
||||
fi
|
||||
rm -rf OUT.TXT ${RMIREG_OUT} rmi_tmp
|
||||
exit ${exitCode}
|
||||
12
jdk/test/java/rmi/registry/readTest/registry.security.policy
Normal file
12
jdk/test/java/rmi/registry/readTest/registry.security.policy
Normal file
@ -0,0 +1,12 @@
|
||||
grant {
|
||||
permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.registry";
|
||||
permission java.util.PropertyPermission "env.class.path", "read";
|
||||
permission java.io.FilePermission ".", "read";
|
||||
permission java.util.PropertyPermission "user.dir", "read";
|
||||
permission java.lang.RuntimePermission "createClassLoader";
|
||||
permission java.lang.RuntimePermission "setContextClassLoader";
|
||||
permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.server";
|
||||
permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport";
|
||||
permission java.lang.RuntimePermission "accessClassInPackage.sun.rmi.transport.tcp";
|
||||
permission java.net.SocketPermission "*:1024-", "listen,resolve,connect,accept";
|
||||
};
|
||||
Loading…
x
Reference in New Issue
Block a user