HADOOP-10645. TestKMS fails because race condition writing acl files. (tucu)
Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1619521 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
a5892e519c
commit
2b0016ec18
|
@ -220,6 +220,8 @@ Release 2.6.0 - UNRELEASED
|
|||
|
||||
HADOOP-10586. KeyShell doesn't allow setting Options via CLI. (clamb via tucu)
|
||||
|
||||
HADOOP-10645. TestKMS fails because race condition writing acl files. (tucu)
|
||||
|
||||
Release 2.5.0 - 2014-08-11
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
|
|
@ -717,6 +717,9 @@ public class TestKMS {
|
|||
}
|
||||
});
|
||||
|
||||
//stop the reloader, to avoid running while we are writing the new file
|
||||
KMSWebApp.getACLs().stopReloader();
|
||||
|
||||
// test ACL reloading
|
||||
Thread.sleep(10); // to ensure the ACLs file modifiedTime is newer
|
||||
conf.set(KMSACLs.Type.CREATE.getConfigKey(), "foo");
|
||||
|
|
Loading…
Reference in New Issue