Skip to content

Commit 5b1caa1

Browse files
committed
YARN-2571 patch 014, more javadoc cleanup
1 parent 6c0691f commit 5b1caa1

20 files changed

+72
-72
lines changed

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/api/BindFlags.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
public interface BindFlags {
3030

3131
/**
32-
* Create the entry.. This is just "0" and can be "or"ed with anything
32+
* Create the entry.. This is just "0" and can be "or"ed with anything.
3333
*/
3434
int CREATE = 0;
3535

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/api/RegistryConstants.java

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,25 @@ public interface RegistryConstants {
3232
/**
3333
* prefix for registry configuration options: {@value}.
3434
* Why <code>hadoop.</code> and not YARN? It can
35-
* live outside YARN
35+
* live outside YARN.
3636
*/
3737
String REGISTRY_PREFIX = "hadoop.registry.";
3838

3939
/**
40-
* Prefix for zookeeper-specific options: {@value}
40+
* Prefix for zookeeper-specific options: {@value}.
4141
* <p>
4242
* For clients using other protocols, these options are not supported.
4343
*/
4444
String ZK_PREFIX = REGISTRY_PREFIX + "zk.";
4545

4646
/**
4747
* flag to indicate whether or not the registry should
48-
* be enabled in the RM: {@value}
48+
* be enabled in the RM: {@value}.
4949
*/
5050
String KEY_REGISTRY_ENABLED = REGISTRY_PREFIX + "rm.enabled";
5151

5252
/**
53-
* Defaut value for enabling the registry in the RM: {@value}
53+
* Default value for enabling the registry in the RM: {@value}.
5454
*/
5555
boolean DEFAULT_REGISTRY_ENABLED = false;
5656

@@ -69,12 +69,12 @@ public interface RegistryConstants {
6969
boolean DEFAULT_REGISTRY_SECURE = false;
7070

7171
/**
72-
* Root path in the ZK tree for the registry: {@value}
72+
* Root path in the ZK tree for the registry: {@value}.
7373
*/
7474
String KEY_REGISTRY_ZK_ROOT = ZK_PREFIX + "root";
7575

7676
/**
77-
* Default root of the yarn registry: {@value}
77+
* Default root of the yarn registry: {@value}.
7878
*/
7979
String DEFAULT_ZK_REGISTRY_ROOT = "/registry";
8080

@@ -92,7 +92,7 @@ public interface RegistryConstants {
9292

9393
/**
9494
* Registry client uses Kerberos: authentication is automatic from
95-
* logged in user
95+
* logged in user.
9696
*/
9797
String REGISTRY_CLIENT_AUTH_KERBEROS = "kerberos";
9898

@@ -104,12 +104,12 @@ public interface RegistryConstants {
104104
String REGISTRY_CLIENT_AUTH_DIGEST = "digest";
105105

106106
/**
107-
* No authentication; client is anonymous
107+
* No authentication; client is anonymous.
108108
*/
109109
String REGISTRY_CLIENT_AUTH_ANONYMOUS = "";
110110

111111
/**
112-
* Registry client authentication ID
112+
* Registry client authentication ID.
113113
* <p>
114114
* This is only used in secure clusters with
115115
* {@link #KEY_REGISTRY_CLIENT_AUTH} set to
@@ -134,24 +134,24 @@ public interface RegistryConstants {
134134

135135
/**
136136
* List of hostname:port pairs defining the
137-
* zookeeper quorum binding for the registry {@value}
137+
* zookeeper quorum binding for the registry {@value}.
138138
*/
139139
String KEY_REGISTRY_ZK_QUORUM = ZK_PREFIX + "quorum";
140140

141141
/**
142-
* The default zookeeper quorum binding for the registry: {@value}
142+
* The default zookeeper quorum binding for the registry: {@value}.
143143
*/
144144
String DEFAULT_REGISTRY_ZK_QUORUM = "localhost:2181";
145145

146146
/**
147-
* Zookeeper session timeout in milliseconds: {@value}
147+
* Zookeeper session timeout in milliseconds: {@value}.
148148
*/
149149
String KEY_REGISTRY_ZK_SESSION_TIMEOUT =
150150
ZK_PREFIX + "session.timeout.ms";
151151

152152
/**
153-
* The default ZK session timeout: {@value}.
154-
*/
153+
* The default ZK session timeout: {@value}.
154+
*/
155155
int DEFAULT_ZK_SESSION_TIMEOUT = 60000;
156156

157157
/**
@@ -224,9 +224,9 @@ public interface RegistryConstants {
224224

225225
/**
226226
* A comma separated list of Zookeeper ACL identifiers with
227-
* system access to the registry in a secure cluster: {@value}.
227+
* user access to the registry in a secure cluster: {@value}.
228228
*
229-
* These are given full access to all entries.
229+
* These are given full access to entries under the user account.
230230
*
231231
* If there is an "@" at the end of an entry it
232232
* instructs the registry client to append the default kerberos domain.
@@ -259,7 +259,7 @@ public interface RegistryConstants {
259259
String KEY_REGISTRY_CLIENT_JAAS_CONTEXT = REGISTRY_PREFIX + "jaas.context";
260260

261261
/**
262-
* default client-side registry JAAS context: {@value}
262+
* default client-side registry JAAS context: {@value}.
263263
*/
264264
String DEFAULT_REGISTRY_CLIENT_JAAS_CONTEXT = "Client";
265265

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/BindingInformation.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@
2323
import org.apache.hadoop.classification.InterfaceStability;
2424

2525
/**
26-
* Binding information provided by a {@link RegistryBindingSource}
26+
* Binding information provided by a {@link RegistryBindingSource}.
2727
*/
2828
@InterfaceAudience.Public
2929
@InterfaceStability.Evolving
3030
public class BindingInformation {
3131

3232
/**
33-
* The Curator Ensemble Provider
33+
* The Curator Ensemble Provider.
3434
*/
3535
public EnsembleProvider ensembleProvider;
3636

3737
/**
38-
* Any information that may be useful for diagnostics
38+
* Any information that may be useful for diagnostics.
3939
*/
4040
public String description;
4141
}

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/RegistryInternalConstants.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public interface RegistryInternalConstants {
4646
int PERMISSIONS_REGISTRY_READERS = ZooDefs.Perms.READ;
4747

4848
/**
49-
* Permissions for system services: {@value}
49+
* Permissions for system services: {@value}.
5050
*/
5151
int PERMISSIONS_REGISTRY_SYSTEM_SERVICES = ZooDefs.Perms.ALL;
5252

@@ -75,7 +75,7 @@ public interface RegistryInternalConstants {
7575

7676
/**
7777
* This the Hadoop environment variable which propagates the identity
78-
* of a user in an insecure cluster
78+
* of a user in an insecure cluster.
7979
*/
8080
String HADOOP_USER_NAME = "HADOOP_USER_NAME";
8181
}

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZKPathDumper.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class ZKPathDumper {
4343
private final boolean verbose;
4444

4545
/**
46-
* Create a path dumper -but do not dump the path until asked
46+
* Create a path dumper -but do not dump the path until asked.
4747
* @param curator curator instance
4848
* @param root root
4949
* @param verbose verbose flag - includes more details (such as ACLs)
@@ -73,7 +73,7 @@ public String toString() {
7373
/**
7474
* Recursively expand the path into the supplied string builder, increasing
7575
* the indentation by {@link #INDENT} as it proceeds (depth first) down
76-
* the tree
76+
* the tree.
7777
* @param builder string build to append to
7878
* @param path path to examine
7979
* @param indent current indentation
@@ -120,7 +120,7 @@ private void expand(StringBuilder builder,
120120
}
121121

122122
/**
123-
* Append the specified indentation to a builder
123+
* Append the specified indentation to a builder.
124124
* @param builder string build to append to
125125
* @param indent current indentation
126126
* @param c charactor to use for indentation

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/impl/zk/ZookeeperConfigOptions.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
/**
2525
* Configuration options which are internal to Zookeeper,
26-
* as well as some other ZK constants
26+
* as well as some other ZK constants.
2727
* <p>
2828
* Zookeeper options are passed via system properties prior to the ZK
2929
* Methods/classes being invoked. This implies that:
@@ -77,7 +77,7 @@ public interface ZookeeperConfigOptions {
7777

7878
/**
7979
* The SASL Server context, referring to a context in the JVM's
80-
* JAAS context file: {@value}
80+
* JAAS context file: {@value}.
8181
*/
8282
String PROP_ZK_SERVER_SASL_CONTEXT =
8383
ZooKeeperSaslServer.LOGIN_CONTEXT_NAME_KEY;

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/types/yarn/PersistencePolicies.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import org.apache.hadoop.registry.client.types.ServiceRecord;
2222

2323
/**
24-
* Persistence policies for {@link ServiceRecord}
24+
* Persistence policies for {@link ServiceRecord}.
2525
*/
2626

2727
public interface PersistencePolicies {
@@ -43,7 +43,7 @@ public interface PersistencePolicies {
4343
String APPLICATION_ATTEMPT = "application-attempt";
4444

4545
/**
46-
* Remove when the YARN container in the ID field finishes: {@value}
46+
* Remove when the YARN container in the ID field finishes: {@value}.
4747
*/
4848
String CONTAINER = "container";
4949

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/main/java/org/apache/hadoop/registry/client/types/yarn/YarnRegistryAttributes.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
package org.apache.hadoop.registry.client.types.yarn;
2020

2121
/**
22-
* YARN specific attributes in the registry
22+
* YARN specific attributes in the registry.
2323
*/
2424
public class YarnRegistryAttributes {
2525

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/AbstractRegistryTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void setupRegistry() throws
6868

6969
/**
7070
* Create a service entry with the sample endpoints, and put it
71-
* at the destination
71+
* at the destination.
7272
* @param path path
7373
* @param createFlags flags
7474
* @return the record
@@ -82,7 +82,7 @@ protected ServiceRecord putExampleServiceEntry(String path, int createFlags) thr
8282

8383
/**
8484
* Create a service entry with the sample endpoints, and put it
85-
* at the destination
85+
* at the destination.
8686
* @param path path
8787
* @param createFlags flags
8888
* @return the record
@@ -100,7 +100,7 @@ protected ServiceRecord putExampleServiceEntry(String path,
100100
}
101101

102102
/**
103-
* Assert a path exists
103+
* Assert a path exists.
104104
* @param path path in the registry
105105
* @throws IOException
106106
*/
@@ -109,7 +109,7 @@ public void assertPathExists(String path) throws IOException {
109109
}
110110

111111
/**
112-
* assert that a path does not exist
112+
* assert that a path does not exist.
113113
* @param path path in the registry
114114
* @throws IOException
115115
*/
@@ -123,7 +123,7 @@ public void assertPathNotFound(String path) throws IOException {
123123
}
124124

125125
/**
126-
* Assert that a path resolves to a service record
126+
* Assert that a path resolves to a service record.
127127
* @param path path in the registry
128128
* @throws IOException
129129
*/

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/AbstractZKRegistryTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,15 @@ public static void createZKServer() throws Exception {
8484
}
8585

8686
/**
87-
* give our thread a name
87+
* give our thread a name.
8888
*/
8989
@Before
9090
public void nameThread() {
9191
Thread.currentThread().setName("JUnit");
9292
}
9393

9494
/**
95-
* Returns the connection string to use
95+
* Returns the connection string to use.
9696
*
9797
* @return connection string
9898
*/

0 commit comments

Comments
 (0)