test cases fixed

Author: guptashailesh92

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-api/src/main/java/org/apache/hadoop/yarn/conf/YarnConfiguration.java

@@ -3277,7 +3277,7 @@ public static boolean isAclEnabled(Configuration conf) {
       + "entity-file.fs-support-append";
   public static final boolean TIMELINE_SERVICE_ENTITYFILE_FS_SUPPORT_APPEND_DEFAULT
       = true;
-      
+
   public static final String
       TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_WITH_USER_DIR =
       TIMELINE_SERVICE_ENTITYGROUP_FS_STORE_PREFIX + "with-user-dir";

hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-timeline-pluginstorage/src/main/java/org/apache/hadoop/yarn/server/timeline/EntityGroupFSTimelineStore.java

@@ -863,7 +863,11 @@ long scanForLogs() throws IOException {
             public int compare(FileStatus o1, FileStatus o2) {
               String[] ts1 = o1.getPath().getName().split("_");
               String[] ts2 = o2.getPath().getName().split("_");
-              return (Integer.parseInt(ts1[ts1.length - 1]) - Integer.parseInt(ts2[ts2.length - 1]));
+              if (StringUtils.isNumeric(ts1[ts1.length - 1]) && StringUtils.isNumeric(ts2[ts2.length - 1])) {
+                return (Integer.parseInt(ts1[ts1.length - 1]) - Integer.parseInt(ts2[ts2.length - 1]));
+              } else {
+                return o1.getPath().getName().compareTo(o2.getPath().getName());
+              }
             }
           });
         }