Merge pull request #93 from intrajp/dev

Fix to skip file which is over the size 50 Mbytes.
uyefe · Mar 30, 2019 · b766741 · b766741
2 parents 940bd4f + f312dfa
commit b766741
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 7 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -52,14 +52,14 @@ install-sosreport_analyzer_data:
             $(INSTALL) -m 644 $(srcdir)/sosreport-analyzer-mcinfo.conf.example $(DESTDIR)$(SOSREPORT_ANALYZER_DATA_PATH)/sosreport-analyzer-mcinfo.conf.example; \
             $(INSTALL) -m 644 $(srcdir)/conf/sosreport-analyzer.conf.CentOS7.example $(DESTDIR)$(SOSREPORT_ANALYZER_DATA_PATH)/sosreport-analyzer.conf.CentOS7.example; \
             $(INSTALL) -m 644 $(srcdir)/conf/sosreport-analyzer.conf.CentOS6.example $(DESTDIR)$(SOSREPORT_ANALYZER_DATA_PATH)/sosreport-analyzer.conf.CentOS6.example; \
-            $(INSTALL) -m 644 $(srcdir)/conf/sosreport-analyzer-mcinfo.conf.AXS6.example $(DESTDIR)$(SOSREPORT_ANALYZER_DATA_PATH)/sosreport-analyzer-mcinfo.conf.AXS6.example; \
+            $(INSTALL) -m 644 $(srcdir)/conf/sosreport-analyzer-mcinfo.conf.AXS4.example $(DESTDIR)$(SOSREPORT_ANALYZER_DATA_PATH)/sosreport-analyzer-mcinfo.conf.AXS4.example; \
 	else \
             $(MKDIR_P) $(DESTDIR)$(SOSREPORT_ANALYZER_DATA_PATH); \
             $(INSTALL) -m 644 $(srcdir)/sosreport-analyzer.conf.example $(DESTDIR)$(SOSREPORT_ANALYZER_DATA_PATH)/sosreport-analyzer.conf.example; \
             $(INSTALL) -m 644 $(srcdir)/sosreport-analyzer-mcinfo.conf.example $(DESTDIR)$(SOSREPORT_ANALYZER_DATA_PATH)/sosreport-analyzer-mcinfo.conf.example; \
             $(INSTALL) -m 644 $(srcdir)/conf/sosreport-analyzer.conf.CentOS7.example $(DESTDIR)$(SOSREPORT_ANALYZER_DATA_PATH)/sosreport-analyzer.conf.CentOS7.example; \
             $(INSTALL) -m 644 $(srcdir)/conf/sosreport-analyzer.conf.CentOS6.example $(DESTDIR)$(SOSREPORT_ANALYZER_DATA_PATH)/sosreport-analyzer.conf.CentOS6.example; \
-            $(INSTALL) -m 644 $(srcdir)/conf/sosreport-analyzer-mcinfo.conf.AXS6.example $(DESTDIR)$(SOSREPORT_ANALYZER_DATA_PATH)/sosreport-analyzer-mcinfo.conf.AXS6.example; \
+            $(INSTALL) -m 644 $(srcdir)/conf/sosreport-analyzer-mcinfo.conf.AXS4.example $(DESTDIR)$(SOSREPORT_ANALYZER_DATA_PATH)/sosreport-analyzer-mcinfo.conf.AXS4.example; \
 	fi
 
 uninstall-sosreport_analyzer_data:

diff --git a/...sreport-analyzer-mcinfo.conf.AXS6.example → ...sreport-analyzer-mcinfo.conf.AXS4.example b/...sreport-analyzer-mcinfo.conf.AXS6.example → ...sreport-analyzer-mcinfo.conf.AXS4.example
@@ -2,7 +2,7 @@
 #
 # If you have installed this program before, new version will not override.
 #
-# Please check /usr/share/sosreport-analyzer/sosreport-analyzer-mcinfo.conf.AXS6.example, and
+# Please check /usr/share/sosreport-analyzer/sosreport-analyzer-mcinfo.conf.AXS4.example, and
 # copy it as /etc/sosreport-analyzer-mcinfo.conf.
 #
 #

diff --git a/conf/sosreport-analyzer.conf.CentOS6.example b/conf/sosreport-analyzer.conf.CentOS6.example
@@ -163,7 +163,7 @@ ps=all
 ## You can set arbitrary item-name including 'all' up to 12
 ## ex. lsof=bash 
 
-lsof=all
+lsof=bash
 
 ## netstat 
 ##

diff --git a/conf/sosreport-analyzer.conf.CentOS7.example b/conf/sosreport-analyzer.conf.CentOS7.example
@@ -163,7 +163,7 @@ ps=all
 ## You can set arbitrary item-name including 'all' up to 12
 ## ex. lsof=bash 
 
-lsof=all
+lsof=bash
 
 ## netstat 
 ##

diff --git a/libsosreport-analyzer/common.c b/libsosreport-analyzer/common.c
@@ -744,10 +744,13 @@ int read_analyze_dir ( const char *member, const char *dname, int recursive )
 
     if ( dname_full != NULL )
     {
-        /* if open directory fails, exit with error message */
+        /* if open directory fails, exit with error message,
+         * and print that the member should be set to 'skip'.
+         */
         if ( ( dir = opendir ( dname_full ) ) == NULL ) 
         {
             printf("can't open directory (%s): %s\n",dname_full,strerror(errno));
+            printf("You should set 'skip' to %s in conf file.\n",member);
             if ( strcmp ( member, "var/crash/" ) == 0 )
             {
                 var_crash_exists = 0;                
@@ -772,7 +775,9 @@ int read_analyze_dir ( const char *member, const char *dname, int recursive )
         for ( dp = readdir ( dir ),i = 0; dp != NULL; dp = readdir ( dir ) )
         {
             char full_path_plus_str [ MAX_LINE_LENGTH ];  
+            char filename [ MAX_LINE_LENGTH ];  
             memset ( full_path_plus_str, '\0', sizeof ( full_path_plus_str ) ); 
+            memset ( filename, '\0', sizeof ( filename ) ); 
 
             if ( ( dp->d_type != DT_REG ) && ( dp->d_type != DT_DIR ) )
                 continue;
@@ -786,8 +791,23 @@ int read_analyze_dir ( const char *member, const char *dname, int recursive )
              * others have big one, compressed or selinux modules.
              * in proc/ there are some files which have only write permissions and couldn't be read.
              * file sos_commands/networking/ethtool_-d* is sometimes too big.
+             *
+             * we should check file with a function and if the file is too big, skip it. 
+             * Now, if file size is over 50Mbytes, skip the file.
              */
+            snprintf (filename, MAX_LINE_LENGTH, "%s%s", dname_full, str );
+            struct stat st;
+            stat(filename, &st);
+            int size = 0;
+            size = st.st_size;
+
+            if ( size > 51200000 )
+            {
+                printf("Skipping %s (size:%d)\n",filename,size);
+                continue;
+            }
             if ( ( strcmp ( str, "." ) == 0 ) || ( strcmp ( str, ".." )  == 0 ) ||
+                ( ( strcmp ( member, "cmdlog/" ) == 0 ) && ( strstr ( str, "verbose" ) != NULL ) ) ||
                 ( ( strcmp ( member, "etc/" ) == 0 ) && ( ( strstr ( str, "cil" ) != NULL ) || ( strstr ( str, "hll" ) != NULL ) ) ) ||
                 ( ( strcmp ( member, "etc/" ) == 0 ) && ( ( strstr ( str, ".bin" ) != NULL ) || ( strstr ( str, ".kern" ) != NULL ) ) ) ||
                 ( ( strcmp ( member, "etc/" ) == 0 ) && ( ( strstr ( str, ".db" ) != NULL ) || ( strstr ( str, "policy." ) != NULL ) ) ) ||

diff --git a/sosreport-analyzer-mcinfo.conf.example b/sosreport-analyzer-mcinfo.conf.example
@@ -1 +1 @@
-conf/sosreport-analyzer-mcinfo.conf.AXS6.example
+conf/sosreport-analyzer-mcinfo.conf.AXS4.example
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		conf/sosreport-analyzer-mcinfo.conf.AXS6.example
		conf/sosreport-analyzer-mcinfo.conf.AXS4.example